Fix up the SSL checks some. Remove some useless old header checks.

	* configure.in: Fix up the SSL checks some. Remove some useless
	old header checks.

diff --git a/ChangeLog b/ChangeLog
index 65ce315..aa3a3f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-18  Dan Winship  <danw@ximian.com>
 
+       * configure.in: Fix up the SSL checks some. Remove some useless
+       old header checks.
+
        * libsoup/soup-misc.h: declare soup_ssl_supported.
 
        * libsoup/soup-gnutls.c: add soup_ssl_supported declaration.

diff --git a/configure.in b/configure.in
index c7ca988..a6fe720 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -82,9 +82,6 @@ dnl *********************************
 dnl *** Networking library checks ***
 dnl *********************************
 
-AC_CHECK_HEADERS(sys/sockio.h sys/poll.h sys/param.h)
-AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
-
 AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
 
@@ -186,7 +183,7 @@ dnl **********************************
 
 AC_ARG_ENABLE(ssl, 
              [  --enable-ssl             Turn on Secure Sockets Layer support [default=yes]],,
-             enable_ssl=yes)
+             enable_ssl=auto)
 
 AC_ARG_ENABLE(ssl-link-static, 
              [  --enable-static-ssl      Link with SSL library statically [default=no]],
@@ -196,15 +193,37 @@ AC_ARG_ENABLE(libgpg-error,
               [  --enable-libgpg-error    Work around broken libgcrypt-config scripts],
               enable_libgpg_error=yes, enable_libgpg_error=no)
 
+if test "$enable_ssl" != "no"; then
+       AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
+       if test $LIBGNUTLS_CONFIG != "no"; then
+               GNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG --cflags | sed -e 's:-I/usr/include::'`
+               GNUTLS_LIBS="`$LIBGNUTLS_CONFIG --libs | sed -e 's:-L/usr/lib *::'` $libgpg_error_libs"
+
+               save_CPPFLAGS="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
+               AC_CHECK_HEADERS(gnutls/gnutls.h, have_ssl=yes; enable_ssl=yes, have_ssl=no)
+               CPPFLAGS="$save_CPPFLAGS"
+       fi
+
+       if test "$have_ssl" != "yes"; then
+               if test "$enable_ssl" == "auto"; then
+                       AC_MSG_WARN(Disabling SSL support);
+                       enable_ssl=no;
+               else
+                       AC_MSG_ERROR(Could not configure SSL support);
+               fi
+       fi
+fi
+
+if test "$enable_ssl" != "no"; then
+       AC_DEFINE(HAVE_SSL, 1, [Defined if you have SSL support])
 
-case $enable_ssl in
-yes)
        libgpg_error_libs_static=""
        libgpg_error_libs=""
 
-       if test "x$enable_libgpg_error" = "xyes"; then
+       if test "$enable_libgpg_error" = "yes"; then
                AM_PATH_GPG_ERROR("0.4")
-               if test "x$GPG_ERROR_LIBS" = "x"; then
+               if test "$GPG_ERROR_LIBS" = ""; then
                        AC_MSG_ERROR([libgpg-error is needed])
                fi
                gpg_error_prefix=$($GPG_ERROR_CONFIG --prefix)
@@ -212,41 +231,15 @@ yes)
                libgpg_error_libs="$GPG_ERROR_LIBS"
        fi
 
-       AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-       case $LIBGNUTLS_CONFIG in
-       no)
-               AC_MSG_WARN(Disabling SSL support)
-               enable_ssl=no
-               break 2
-               ;;
-       esac
-
-       GNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG --cflags | sed -e 's:-I/usr/include::'`
-       GNUTLS_LIBS="`$LIBGNUTLS_CONFIG --libs | sed -e 's:-L/usr/lib *::'` $libgpg_error_libs"
-
-       save_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
-       AC_CHECK_HEADERS(gnutls/gnutls.h,,
-                        [AC_MSG_WARN(Disabling SSL support)
-                         enable_ssl=no
-                         break])
-       CPPFLAGS="$save_CPPFLAGS"
-
-       case $enable_static_ssl in
-       yes)
+       if "$enable_static_ssl" == "yes"; then
                gnutls_libdir=`$LIBGNUTLS_CONFIG --exec-prefix`/lib
                GNUTLS_LIBS="$gnutls_libdir/libgnutls.a $gnutls_libdir/libgcrypt.a $libgpg_error_libs_static"
-               ;;
-       esac
-
-       AC_DEFINE(HAVE_SSL, 1, [Defined if you have SSL support])
-       ;;
-esac
+       fi
+fi
 
 AC_SUBST(GNUTLS_CFLAGS)
 AC_SUBST(GNUTLS_LIBS)
 
-
 dnl *********************************************
 dnl *** Checks for gtk-doc (lifted from glib) ***
 dnl *********************************************