From 4ef4b019ca344f6c4768690e7865564933ce025e Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 16 Jan 2002 21:13:27 +0000 Subject: [PATCH] Added conditional support for Norman's jpegfactory code (requires libjpeg to be already installed.) --- configure.in | 29 +++++++++++++++++++++++++++++ simgear/simgear_config.h.in | 3 +++ 2 files changed, 32 insertions(+) diff --git a/configure.in b/configure.in index a65e0ce4..d2d7adc0 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,29 @@ if test "x$with_efence" = "xyes" ; then LIBS="$LIBS -lefence" fi +# Specify if we want to build with Norman's jpeg image server support. +# This requires libjpeg to be installed and available. +# Default to with_jpeg_server=no +JPEGLIB='' +AC_ARG_WITH(jpeg_factory, [ --with-jpeg-factory Include Norman's jpeg image factory support code]) +if test "x$with_jpeg_factory" = "xyes" ; then + echo "Building with Norman's jpeg image factory support" + AC_CHECK_LIB(jpeg, jpeg_start_compress) + if test "x$ac_cv_lib_jpeg_jpeg_start_compress" != "xyes" ; then + echo + echo "In order to build the jpeg factory code you need libjpeg installed." + echo "otherwise please configure with the --with-jpeg-sever=no option" + echo + echo "libjpeg is available at :" + echo " ftp://ftp.uu.net in the directory graphics/jpeg" + exit 1 + fi +else + echo "Building without Norman's jpeg image server support" +fi +AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$with_jpeg_factory" = "xyes") + + dnl Check for MS Windows environment AC_CHECK_HEADER(windows.h) @@ -349,6 +372,12 @@ fi echo -n "Automake version: ($AUTO_MAKE_VERSION) " automake --version | head -1 +if test "x$with_jpeg_factory" = "xyes"; then + echo "With JPEG Factory support" +else + echo "Without JPEG Factory support" +fi + if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then echo "Threads: pthread lib found." else diff --git a/simgear/simgear_config.h.in b/simgear/simgear_config.h.in index f63fe4b2..74a3ba87 100644 --- a/simgear/simgear_config.h.in +++ b/simgear/simgear_config.h.in @@ -197,6 +197,9 @@ /* Define if you have the glut library (-lglut). */ #undef HAVE_LIBGLUT +/* Define if you have the jpeg library (-ljpeg). */ +#undef HAVE_LIBJPEG + /* Define if you have the m library (-lm). */ #undef HAVE_LIBM -- 2.39.5