Fixes to make telnet interface work more than 1x.

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index 17c00741094e5e44c798a2ca0af8c45e83045cca..5c8f4a208e0a4d003fe20ffc6d31a9f9ca1f87b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,11 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+# Check to see if this `configure' is being run in the `Cygwin32' environment
+AC_CYGWIN
+AC_MINGW32
+AC_EXEEXT
+
 AR="ar"
 OS=`uname -s`
 if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
@@ -50,7 +55,7 @@ else
     echo "includedir changed to" $includedir "libdir is" $libdir
 fi
          
-# Determine version of automake ... important becuase of
+# Determine version of automake ... important because of
 # incompatibilities between versions
 AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\-p[[0-9]]$//' | sed -e 's/\.//'`
 AM_CONDITIONAL(ANCIENT_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 14)
@@ -71,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)
 
@@ -86,7 +114,6 @@ if test "x$HOSTTYPE" != "xmacintosh" ; then
         if test -d /usr/mingw/usr ; then
             EXTRA_DIRS="$EXTRA_DIRS /usr/mingw/usr"
         fi
-        EXTRA_DIRS="${EXTRA_DIRS} `pwd`/Win32"
     fi
 fi
 
@@ -114,6 +141,10 @@ null_LIBS="$LIBS"
 
 AC_CHECK_LIB(m, cos)
 
+if test  "x$ac_cv_mingw32" = "xyes" ; then
+    LIBS="$LIBS -lwsock32"
+fi
+
 base_LIBS="$LIBS"
 
 dnl Thread related checks
@@ -209,6 +240,9 @@ else
 
     LIBS="$LIBS -l${WIN32_GLUT} -l${WIN32_GLU} -l${WIN32_OPENGL}"
     LIBS="$LIBS -luser32 -lgdi32"
+    if test  "x$ac_cv_mingw32" = "xyes" ; then
+       LIBS="$LIBS -wsock32"
+    fi
     echo "Will link apps with $LIBS"
 fi
 
@@ -338,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