Author: kraftche Date: 2010-09-03 13:41:34 -0500 (Fri, 03 Sep 2010) New Revision: 4124 Modified: cgm/trunk/cgm.make.in cgm/trunk/configure.ac Log: fix old, no longer substitued autoconf vars in cgm.make Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2010-09-03 18:03:35 UTC (rev 4123) +++ cgm/trunk/cgm.make.in 2010-09-03 18:41:34 UTC (rev 4124) @@ -29,7 +29,7 @@ -I@abs_top_srcdir@/geom/Cholla # Pre-processor flags -CGM_DEFINES = @CANT_USE_STD@ @CANT_USE_STD_IO@ @TEMPLATE_DEFS_INCLUDED@ @HAVE_ACIS_DEF@ @HAVE_OCC_DEF@ +CGM_DEFINES = @CGM_DEFINES@ @HAVE_ACIS_DEF@ @HAVE_OCC_DEF@ CGM_INCLUDES = @CGM_EXT_INCLUDE@ $(CGM_INT_INCLUDE) CGM_CPPFLAGS = $(CGM_DEFINES) $(CGM_INCLUDES) Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2010-09-03 18:03:35 UTC (rev 4123) +++ cgm/trunk/configure.ac 2010-09-03 18:41:34 UTC (rev 4124) @@ -68,8 +68,10 @@ FATHOM_CANT_USE_STD FATHOM_TEMPLATE_DEFS_INCLUDED -AM_CPPFLAGS="$AM_CPPFLAGS $CANT_USE_STD $CANT_USE_STD_IO $TEMPLATE_DEFS_INCLUDED" +CGM_DEFINES="$CANT_USE_STD $CANT_USE_STD_IO $TEMPLATE_DEFS_INCLUDED" +AM_CPPFLAGS="$AM_CPPFLAGS $CGM_DEFINES" AM_CONDITIONAL(INCLUDE_TEMPLATE_DEFS, test x$TEMPLATE_DEFS_INCLUDED != x) +AC_SUBST(CGM_DEFINES) ################################################################################ # Use Cubit shared libraries