Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added AM_CONDITIONAL directives for better backwards compatibility wi…

…th automake.
  • Loading branch information...
commit 8634e659e5383fb4c371174c0e051f88c585f208 1 parent 2932fa1
@broxtronix broxtronix authored
Showing with 18 additions and 0 deletions.
  1. +18 −0 configure.ac
View
18 configure.ac
@@ -274,6 +274,8 @@ dnl AX_PKG(QT, [QT_CORE QT_GUI QT_NETWORK QT_SQL], [])
dnl AX_PKG(ISIS3RDPARTY, [], [-lgeos -lgeos_c -lxerces-c -lgsl -lgslcblas -liconv -lqwt -lpq -lqwt -lz])
dnl AX_PKG(ISIS, [SPICE QT ISIS3RDPARTY], [-lisis3])
+# These are here (instead of inside the PKG macro where they belong)
+# for backwards compatability with older versions of automake.
AM_CONDITIONAL(HAVE_PKG_ISIS, [test "$HAVE_PKG_ISIS" = "yes"])
##################################################
@@ -294,6 +296,22 @@ AX_APP(RMAX2CAHVOR, [src], no, [BOOST VW VW_CAMERA BOOST_PROGRAM_OPTIONS BOOST_F
AX_APP(RMAXADJUST, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO VW_INTEREST_POINT LAPACK])
AX_APP(BUNDLEVIS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS OPENSCENEGRAPH VW VW_CAMERA])
+# These are here (instead of inside the APP macro where they belong)
+# for backwards compatability with older versions of automake.
+AM_CONDITIONAL(MAKE_APP_STEREO, [test "$MAKE_APP_STEREO" = "yes"])
+AM_CONDITIONAL(MAKE_APP_ORTHOPROJECT, [test "$MAKE_APP_ORTHOPROJECT" = "yes"])
+AM_CONDITIONAL(MAKE_APP_BUNDLEADJUST, [test "$MAKE_APP_BUNDLEADJUST" = "yes"])
+AM_CONDITIONAL(MAKE_APP_ORBITVIZ, [test "$MAKE_APP_ORBITVIZ" = "yes"])
+AM_CONDITIONAL(MAKE_APP_DISPARITYDEBUG, [test "$MAKE_APP_DISPARITYDEBUG" = "yes"])
+AM_CONDITIONAL(MAKE_APP_POINT2MESH, [test "$MAKE_APP_POINT2MESH" = "yes"])
+AM_CONDITIONAL(MAKE_APP_POINT2MESH2, [test "$MAKE_APP_POINT2MESH2" = "yes"])
+AM_CONDITIONAL(MAKE_APP_POINT2DEM, [test "$MAKE_APP_POINT2DEM" = "yes"])
+AM_CONDITIONAL(MAKE_APP_NURBS, [test "$MAKE_APP_NURBS" = "yes"])
+AM_CONDITIONAL(MAKE_APP_CTXIMAGE, [test "$MAKE_APP_CTXIMAGE" = "yes"])
+AM_CONDITIONAL(MAKE_APP_RMAX2CAHVOR, [test "$MAKE_APP_RMAX2CAHVOR" = "yes"])
+AM_CONDITIONAL(MAKE_APP_RMAXADJUST, [test "$MAKE_APP_RMAXADJUST" = "yes"])
+AM_CONDITIONAL(MAKE_APP_BUNDLEVIS, [test "$MAKE_APP_BUNDLEVIS" = "yes"])
+
##################################################
# final processing
##################################################
Please sign in to comment.
Something went wrong with that request. Please try again.