Changeset 2042

Timestamp:

08/18/08 11:40:10 (4 months ago)

Author:

kraftche

Message:

As of version 4.3, g++ no longer includes backwards-compatible headers
ending in '.h' for C++ standard headers. ACIS (at least up to version
16) includes "new.h" in many headers that are included indirectly by
CGM code. Provide our own version of new.h and conditionally use it
if building with ACIS support and the system does not provide a new.h.

Files:

• cgm/trunk/compat (added)
• cgm/trunk/compat/new (added)
• cgm/trunk/compat/new/new.h (added)
• cgm/trunk/configure.in (modified) (1 diff)

cgm/trunk/configure.in

@@ -194 +194 @@
-  HAVE_ACIS_DEF=-DHAVE_ACIS
-fi
+
+# ACIS (at least up to version 16) requires new.h. 
+# Newer C++ compilers may not provide this backwards-compatibility
+# file.  Check if it is present, and if not, use our own.
+ACIS_NEW_COMPAT_INC='-I${top_srcdir}/compat/new'
+if test "x$ACIS_DIR" != "xno"; then
+  AC_LANG_PUSH(C++)
+  AC_CHECK_HEADER([new.h],[],[ACIS_INCLUDES="$ACIS_INCLUDES $ACIS_NEW_COMPAT_INC"])
+  AC_LANG_POP(C++)
+fi
+
-AC_SUBST(ACIS_DEFS)
-AC_SUBST(ACIS_DIR)