Author: jvporter Date: 2012-05-23 13:47:53 -0500 (Wed, 23 May 2012) New Revision: 5530 Modified: cgm/trunk/configure.ac Log: Change --enable-shim to --with-shim to allow specifying shim directory Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2012-05-23 17:05:41 UTC (rev 5529) +++ cgm/trunk/configure.ac 2012-05-23 18:47:53 UTC (rev 5530) @@ -396,11 +396,22 @@ ################################################################################ # ITAPS shim ################################################################################ -AC_ARG_ENABLE([shim],[AC_HELP_STRING([--enable-shim], - [Enable ITAPS shim])], - [ITAPS_SHIM=$enableval],[ITAPS_SHIM=no]) -AM_CONDITIONAL([ITAPS_SHIM],[test "xyes" = "x$ITAPS_SHIM"]) +AC_ARG_WITH(shim, + [AC_HELP_STRING([--with-shim], + [Enable ITAPS shim])], + [SHIM_DIR="$withval"], + [SHIM_DIR=no]) +AM_CONDITIONAL([ITAPS_SHIM],[test "xno" != "x$SHIM_DIR"]) +if test "x$CUBIT_DIR" == "xyes"; then + AC_MSG_ERROR([Option --with-shim without specifying Cubit directory.]) +elif test "x$SHIM_DIR" != "xno"; then + if ! test -d "$SHIM_DIR"; then + AC_MSG_ERROR([$SHIM_DIR: not a directory.]) + fi + AM_CPPFLAGS="$AM_CPPFLAGS -I$SHIM_DIR" +fi + ################################################################################ # OCC Options ################################################################################