X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=0afede1a48ed68220a57e6b9d6bc75ae836de932;hb=c54cea8055c02156613e94f628cc5a1b39be85c1;hp=31daed80dcde35ae5f77234824b55f9bece06730;hpb=7282491294980246835e123f476fcd8e8766d5bc;p=flightgear.git diff --git a/configure.ac b/configure.ac index 31daed80d..0afede1a4 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.52) dnl Initialize the automake stuff dnl set the $host variable based on local machine/os AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(FlightGear, 0.9.10-pre3) +AM_INIT_AUTOMAKE(FlightGear, 0.9.10) dnl Checks for programs. AC_PROG_MAKE_SET @@ -38,6 +38,14 @@ if test "x$with_plib" != "x" ; then EXTRA_DIRS="${EXTRA_DIRS} $with_plib" fi +# specify the osg location +AC_ARG_WITH(osg, [ --with-osg=PREFIX Specify the prefix path to osg]) + +if test "x$with_osg" != "x" ; then + echo "osg prefix is $with_osg" + EXTRA_DIRS="${EXTRA_DIRS} $with_osg" +fi + dnl Determine an extra directories to add to include/lib search paths case "${host}" in *-apple-darwin* | *-*-mingw32*) @@ -91,7 +99,11 @@ if test "x$with_logging" = "xno" ; then fi AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] ) -AC_DEFINE([ENABLE_SP_FMDS], test "x$enable_sp_fdms" = "xyes", [Define to include special purpose FDMs]) +if test "x$enable_sp_fdms" != "xno"; then + AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs]) +else + AC_DEFINE([ENABLE_SP_FDM], 0, [Define to include special purpose FDMs]) +fi AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno") @@ -527,6 +539,7 @@ AC_CONFIG_FILES([ \ src/Input/Makefile \ src/Instrumentation/Makefile \ src/Instrumentation/KLN89/Makefile \ + src/Instrumentation/HUD/Makefile \ src/Main/Makefile \ src/Main/runfgfs \ src/Main/runfgfs.bat \