Don't bail out when not finding libnurbs++ but just don't create genairport and end with a warning
This commit is contained in:
parent
47771c9bb4
commit
d8fcc7232a
2 changed files with 16 additions and 11 deletions
19
configure.ac
19
configure.ac
|
@ -223,16 +223,7 @@ fi
|
||||||
|
|
||||||
dnl Check for "libnurbs++" without which we cannot go on
|
dnl Check for "libnurbs++" without which we cannot go on
|
||||||
AC_CHECK_HEADER(nurbs++/nurbsS.h)
|
AC_CHECK_HEADER(nurbs++/nurbsS.h)
|
||||||
if test "x$ac_cv_header_nurbspp_nurbsS_h" != "xyes"; then
|
AM_CONDITIONAL(HAVE_NURBS, test "x$ac_cv_header_nurbspp_nurbsS_h" = "xyes" )
|
||||||
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
|
|
||||||
AC_LANG_POP
|
AC_LANG_POP
|
||||||
|
|
||||||
dnl Check if Generic Polygon Clipping library is installed
|
dnl Check if Generic Polygon Clipping library is installed
|
||||||
|
@ -411,3 +402,11 @@ else
|
||||||
echo "Debug messages: yes"
|
echo "Debug messages: yes"
|
||||||
fi
|
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
|
||||||
|
|
|
@ -1 +1,7 @@
|
||||||
SUBDIRS = GenAirports
|
if HAVE_NURBS
|
||||||
|
GEN_AIRPORTS_DIR = GenAirports
|
||||||
|
else
|
||||||
|
GEN_AIRPORTS_DIR =
|
||||||
|
fi
|
||||||
|
|
||||||
|
SUBDIRS = $(GEN_AIRPORTS_DIR)
|
||||||
|
|
Loading…
Reference in a new issue