diff --git a/Makefile.am b/Makefile.am index 3940befa7..185342900 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,11 @@ fgfs-base-tar: data/AUTHORS \ data/Aircraft/737 \ data/Aircraft/747 \ + data/Aircraft/A-10 \ data/Aircraft/A320 \ + data/Aircraft/AN-225 \ + data/Aircraft/B-52F \ + data/Aircraft/BAC-TSR2 \ data/Aircraft/ComperSwift \ data/Aircraft/Generic \ data/Aircraft/Hunter \ @@ -57,8 +61,7 @@ fgfs-base-tar: data/Aircraft/X15 \ data/Aircraft/YF-23 \ data/Aircraft/a4 \ - data/Aircraft/an225 \ - data/Aircraft/b52 \ + data/Aircraft/beech99 \ data/Aircraft/bo105 \ data/Aircraft/c172 \ data/Aircraft/c172-fs-set.xml \ @@ -79,7 +82,7 @@ fgfs-base-tar: data/Aircraft/seahawk \ data/Aircraft/sgs233 \ data/Aircraft/t6texan2 \ - data/Aircraft/tsr2 \ + data/Aircraft/tu154 \ data/Aircraft/ufo \ data/Aircraft/wrightFlyer1903 \ data/Airports \ diff --git a/configure.ac b/configure.ac index bdc836689..fa4a98c25 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,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.5-pre1) +AM_INIT_AUTOMAKE(FlightGear, 0.9.5-pre2) dnl Checks for programs. AC_PROG_MAKE_SET @@ -427,15 +427,14 @@ AC_TRY_RUN([ int main() { int major, minor, micro; - printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); + /* printf("%d.%d.%d or greater, ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); */ + printf("[found %s] ... ", STRINGIFY(SIMGEAR_VERSION)); sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, µ ); - if ( major < MIN_MAJOR ) { - return -1; - } else if ( major == MIN_MAJOR && minor < MIN_MINOR ) { - return -1; - } else if ( major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO ){ + if ( (major < MIN_MAJOR) || + (major == MIN_MAJOR && minor < MIN_MINOR) || + (major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO) ) { return -1; } @@ -451,7 +450,7 @@ int main() { LIBS="$saved_LIBS" -dnl Check if SimGear was built with Norman JPEG factory support +dnl Check if SimGear was built with Norman's JPEG factory support AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx) if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then AC_CHECK_LIB(jpeg, jpeg_start_compress) diff --git a/src/Main/main.cxx b/src/Main/main.cxx index f95fb6335..c9fabb061 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -1542,7 +1542,7 @@ bool fgMainInit( int argc, char **argv ) { fgInitFGRoot(argc, argv); // Check for the correct base package version - static char required_version[] = "0.9.5-pre1"; + static char required_version[] = "0.9.5-pre2"; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application