From d8fcc7232aeac05bb72dd9fe928d242979806da2 Mon Sep 17 00:00:00 2001 From: ehofman Date: Sun, 24 Aug 2003 17:27:25 +0000 Subject: [PATCH] Don't bail out when not finding libnurbs++ but just don't create genairport and end with a warning --- configure.ac | 19 +++++++++---------- src/Airports/Makefile.am | 8 +++++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index cc3d8df4..46011a80 100644 --- a/configure.ac +++ b/configure.ac @@ -223,16 +223,7 @@ fi dnl Check for "libnurbs++" without which we cannot go on AC_CHECK_HEADER(nurbs++/nurbsS.h) -if test "x$ac_cv_header_nurbspp_nurbsS_h" != "xyes"; then - echo - echo "You *must* have the nurbs++ library installed on your system to build" - echo "TerraGear!" - echo - echo "Please see README.nurbs++ for more details." - echo - echo "configure aborted." - exit -fi +AM_CONDITIONAL(HAVE_NURBS, test "x$ac_cv_header_nurbspp_nurbsS_h" = "xyes" ) AC_LANG_POP dnl Check if Generic Polygon Clipping library is installed @@ -411,3 +402,11 @@ else echo "Debug messages: yes" fi +if test "x$ac_cv_header_nurbspp_nurbsS_h" != "xyes"; then + echo + echo "You *must* have the nurbs++ library installed on your system to build" + echo "TerraGears GenAirport utility!" + echo + echo "Please see README.nurbs++ for more details." + echo +fi diff --git a/src/Airports/Makefile.am b/src/Airports/Makefile.am index 999705c5..4b252be3 100644 --- a/src/Airports/Makefile.am +++ b/src/Airports/Makefile.am @@ -1 +1,7 @@ -SUBDIRS = GenAirports +if HAVE_NURBS +GEN_AIRPORTS_DIR = GenAirports +else +GEN_AIRPORTS_DIR = +fi + +SUBDIRS = $(GEN_AIRPORTS_DIR)