Changeset 37a11e in git

Timestamp:

Jan 22, 2015, 6:51:51 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

ca8ff27d6b290f42a965227eda1ca3bbd637e204

Parents:

1e210d65d8dc82cc829f8b88cf056d035bb9b311

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-01-22 18:51:51+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-01-22 18:57:37+01:00

Message:

Make factory config script  more configurable

File:

• factory/configure.ac (modified) (2 diffs)

factory/configure.ac

@@ -108 +108 @@
   AC_DEFINE([SINGULAR],[1])
   AC_DEFINE([DISABLE_GMP_CPP],[1])
+#  AC_DEFINE([NOSTREAMIO],[1])
+fi
+
+# || test "x$with_Singular" = xyes
+# Use no streamio (C++) if SINGULAR or explicitely disabled
+if test "x$enable_streamio" = xno;  then
   AC_DEFINE([NOSTREAMIO],[1])
-fi
-
-# Use no streamio (C++) if SINGULAR or explicitely disabled
-if test "x$enable_streamio" = xno || test "x$with_Singular" = xyes;  then
-  AC_DEFINE([NOSTREAMIO],[1])
-else
-  AC_CHECK_HEADERS(iostream.h strstream.h fstream.h iostream string fstream)
-  AC_CHECK_HEADERS(ctype.h, , [ AC_MSG_ERROR(standard C header files not found) ])
-
-  # since the FTE will compile only with stream IO enabled we will not
-  # check for the necessary header files if stream IO is disabled
-  AC_CHECK_HEADERS(stdarg.h signal.h errno.h unistd.h, ,
-    [ AC_MSG_WARN(C/C++ header files not found.
-                    You will not be able to build the Factory Test Environment
-                    (though Factory itself should compile)) ])
 fi
 
 AM_CONDITIONAL(
     [WITH_PARSER_FOR_CANONICAL_FORM],
-    [test x$with_Singular != xyes && test x$enable_streamio != xno])
+    [test "x$enable_streamio" = xyes])
 
 AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
@@ -240 +231 @@
 #
 AC_LANG_CPLUSPLUS
+AC_LANG_PUSH([C++])
 
 AC_CHECK_HEADERS(stdio.h stdlib.h string.h time.h math.h, ,
   [ AC_MSG_ERROR(C header files not found) ])
 AC_CHECK_HEADERS(cstdio)
+
+if test "x$enable_streamio" != xno;  then
+  AC_CHECK_HEADERS(iostream.h strstream.h fstream.h iostream string fstream)
+  AC_CHECK_HEADERS(ctype.h, , [ AC_MSG_ERROR(standard C header files not found) ])
+
+  # since the FTE will compile only with stream IO enabled we will not
+  # check for the necessary header files if stream IO is disabled
+  AC_CHECK_HEADERS(stdarg.h signal.h errno.h unistd.h, ,
+    [ AC_MSG_WARN(C/C++ header files not found.
+                    You will not be able to build the Factory Test Environment
+                    (though Factory itself should compile)) ])
+fi
+
 
 if test "x$enable_timing" != xno; then