Author: kraftche Date: 2008-12-04 13:02:10 -0600 (Thu, 04 Dec 2008) New Revision: 2468 Added: cgm/trunk/compat/Makefile.am Modified: cgm/trunk/Makefile.am cgm/trunk/configure.in cgm/trunk/geom/OCC/Makefile.am Log: o Retain --with-occ and --with-acis options during 'make distcheck' o Include compat/new/new.h in tarball o Include geom/OCC/OCCCoFace.hpp in tarball Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2008-12-04 17:32:31 UTC (rev 2467) +++ cgm/trunk/Makefile.am 2008-12-04 19:02:10 UTC (rev 2468) @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = util geom init . itaps test cgm_apps +SUBDIRS = compat util geom init . itaps test cgm_apps # Don't loose the autoconf include path ACLOCAL_AMFLAGS = -I m4 Added: cgm/trunk/compat/Makefile.am =================================================================== --- cgm/trunk/compat/Makefile.am (rev 0) +++ cgm/trunk/compat/Makefile.am 2008-12-04 19:02:10 UTC (rev 2468) @@ -0,0 +1 @@ +EXTRA_DIST = new/new.h Modified: cgm/trunk/configure.in =================================================================== --- cgm/trunk/configure.in 2008-12-04 17:32:31 UTC (rev 2467) +++ cgm/trunk/configure.in 2008-12-04 19:02:10 UTC (rev 2468) @@ -70,10 +70,13 @@ AC_ARG_WITH( cubit, AC_HELP_STRING([--with-cubit=<dir>],[Use CGM from CUBIT shared library]), - [CUBIT_DIR="$withval"],[CUBIT_DIR=no]) + [CUBIT_DIR="$withval" + DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-cubit=\"${withval}\""], + [CUBIT_DIR=no]) AC_ARG_WITH( CUBIT, AC_HELP_STRING([--with-CUBIT=<dir>],[DEPRECATED. Use --with-cubit (small case)]), - [CUBIT_DIR="$withval"]) + [CUBIT_DIR="$withval" + DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-cubit=\"${withval}\""]) if test "x$CUBIT_DIR" == "xyes"; then AC_MSG_ERROR([Option --with-CUBIT without specifying Cubit directory.]) elif test "x$CUBIT_DIR" != "xno"; then @@ -147,10 +150,13 @@ AC_ARG_WITH( acis, AC_HELP_STRING([--with-acis=<dir>],[Build with ACIS support, specify directory where ACIS is installed.]), - [ACIS_DIR=$withval],[ACIS_DIR=no] ) + [ACIS_DIR=$withval + DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-acis=\"${withval}\""], + [ACIS_DIR=no] ) AC_ARG_WITH( ACIS, AC_HELP_STRING([--with-ACIS],[DEPRECATED. Use --wtih-acis (small case)]), - [ACIS_DIR=$withval] ) + [ACIS_DIR=$withval + DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-acis=\"${withval}\""] ) AC_ARG_WITH( ACIS-system, AC_HELP_STRING([--with-acis-system=SYS], [Specify ACIS system name (e.g. linux_so), default is to autodetect.]), [ACIS_SYSTEM=$withval],[ACIS_SYSTEM=] ) @@ -264,7 +270,8 @@ AC_ARG_WITH( occ, [AC_HELP_STRING([--with-occ=<dir>],[OpenCascade shared library directory])], - [occ_DIR="$withval"], + [occ_DIR="$withval" + DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-occ=\"${withval}\""], [occ_DIR=no] ) # if user specified option (other than --without-occ) @@ -395,6 +402,7 @@ # Output Files ################################################################################ AC_SUBST(AM_CPPFLAGS) +AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) AC_MSG_RESULT([CXXFLAGS = $CXXFLAGS]) dnl AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi], dnl [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] ) @@ -411,6 +419,7 @@ geom/parallel/Makefile geom/virtual/Makefile init/Makefile + compat/Makefile cgm.make itaps/Makefile itaps/iGeom-Defs.inc Modified: cgm/trunk/geom/OCC/Makefile.am =================================================================== --- cgm/trunk/geom/OCC/Makefile.am 2008-12-04 17:32:31 UTC (rev 2467) +++ cgm/trunk/geom/OCC/Makefile.am 2008-12-04 19:02:10 UTC (rev 2468) @@ -43,6 +43,7 @@ OCCAttribSet.hpp \ OCCBody.hpp \ OCCCoEdge.hpp \ + OCCCoFace.hpp \ OCCCurve.hpp \ OCCGeometryCreator.hpp \ OCCLoop.hpp \