[cgma-dev] r1544 - cgm/trunk

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-01-18 14:09:56 -0600 (Fri, 18 Jan 2008)
New Revision: 1544

Modified:
   cgm/trunk/configure.in
Log:
Fix strange configure stuff:

OCC requires some configure defines about standard headers
(HAVE_IOSTREAM, HAVE_IOSTREAM_H, etc.) Previous code defined 
these depending on wether or not the platform is 64-bit. That
doesn't make any sense to me, so I'm adding proper checks for
these headers.


Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-01-18 19:53:39 UTC (rev 1543)
+++ cgm/trunk/configure.in	2008-01-18 20:09:56 UTC (rev 1544)
@@ -272,9 +272,19 @@
   # Check if 64-bit
   AC_MSG_CHECKING([if platform is 64-bit (-D_OCC64)])
   AC_TRY_COMPILE([],[int array[6-(int)sizeof(void*)];],[AC_MSG_RESULT(no)],
-                 [AC_MSG_RESULT(yes); OCC_INC_FLAG="$OCC_INC_FLAG -D_OCC64 -DHAVE_IOSTREAM_H -DHAVE_LIMITS_H"])
+                 [AC_MSG_RESULT(yes); OCC_INC_FLAG="$OCC_INC_FLAG -D_OCC64"])
 
-  # Check if OCC has Stadard_Version.hxx
+  # OCC requires some defines
+  AC_LANG_PUSH(C++)
+  AC_CHECK_HEADER([iostream],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_IOSTREAM"])
+  AC_CHECK_HEADER([iostream.h],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_IOSTREAM_H"])
+  AC_CHECK_HEADER([iomanip],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_IOMANIP"])
+  AC_CHECK_HEADER([iomanip.h],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_IOMANIP_H"])
+  AC_CHECK_HEADER([fstream],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_FSTREAM"])
+  AC_CHECK_HEADER([fstream.h],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_FSTREAM_H"])
+  AC_CHECK_HEADER([limits.h],[OCC_INC_FLAG="$OCC_INC_FLAG -DHAVE_LIMITS_H"])
+
+  # Check for CCC headers Stadard_Version.hxx
   AC_CHECK_HEADER( [Standard_Version.hxx], [],
                  [AC_MSG_ERROR([OpenCascade config error:Standard_Version.hxx not found])] )
 
@@ -283,6 +293,7 @@
   AC_CHECK_LIB( [TKernel], [create_mailbox],,
                 [AC_MSG_ERROR([OpenCascade config error: libTKernel not found ])])
   LIBS="$old_LIBS"
+  AC_LANG_POP(C++)
 
   # Restore original values of variables
   CPPFLAGS="$old_CPPFLAGS"