fly/flightgear
1
0
Fork 0
Code Activity

Jim Wilson:

Browse source 
This patch fixes configure.ac so that when an alternate prefix location for simgear is specified, configure tests for the header file jpegfactory.hxx in that specific location only.
This commit is contained in:
ehofman 2006-01-21 10:06:09 +00:00
parent 919ccdb96a
commit 480b8c5330
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -380,7 +380,11 @@ AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
dnl Check for the presence of SimGear dnl Check for the presence of SimGear
if test "x$with_simgear" != "x"; then
AC_CHECK_HEADER($with_simgear/include/simgear/version.h, [ac_cv_header_simgear_version_h=yes], [ac_cv_header_simgear_version_h=no])
else
AC_CHECK_HEADER(simgear/version.h) AC_CHECK_HEADER(simgear/version.h)
fi
if test "x$ac_cv_header_simgear_version_h" != "xyes"; then if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
echo echo
echo "You *must* have the SimGear support library installed on your system" echo "You *must* have the SimGear support library installed on your system"
@ -432,7 +436,11 @@ int main() {
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
dnl Check if SimGear was built with Norman's JPEG factory support dnl Check if SimGear was built with Norman's JPEG factory support
if test "x$with_simgear" != "x"; then
AC_CHECK_HEADER($with_simgear/include/simgear/screen/jpgfactory.hxx,[ac_cv_header_simgear_screen_jpgfactory_hxx=yes],[ac_cv_header_simgear_screen_jpgfactory_hxx=no])
else
AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx) AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx)
fi
if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then
AC_CHECK_LIB(jpeg, jpeg_start_compress) AC_CHECK_LIB(jpeg, jpeg_start_compress)
if test "x$ac_cv_lib_jpeg_jpeg_start_compress" != "xyes" ; then if test "x$ac_cv_lib_jpeg_jpeg_start_compress" != "xyes" ; then