Add in the --enable-libgpg-error flag from the 2.0 branch.

2003-11-17  Joe Shaw  <joe@ximian.com>

	* configure.in: Add in the --enable-libgpg-error flag from the 2.0
	branch.

	* acinclude.m4: Include the gpg-error macros.

diff --git a/ChangeLog b/ChangeLog
index 9d3dcde..eed14a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-17  Joe Shaw  <joe@ximian.com>
+
+       * configure.in: Add in the --enable-libgpg-error flag from the 2.0
+       branch.
+
+       * acinclude.m4: Include the gpg-error macros.
+
 2003-11-17  Rodrigo Moya <rodrigo@ximian.com>
 
        * libsoup/soup-soap-message.[ch]: new class to make it easier to

diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644 (file)
index 0000000..f76568b
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,57 @@
+dnl Autoconf macros for libgpg-error
+
+dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
+dnl
+AC_DEFUN(AM_PATH_GPG_ERROR,
+[ AC_ARG_WITH(gpg-error-prefix,
+            AC_HELP_STRING([--with-gpg-error-prefix=PFX],
+                           [prefix where GPG Error is installed (optional)]),
+     gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
+  if test x$gpg_error_config_prefix != x ; then
+     gpg_error_config_args="$gpg_error_config_args --prefix=$gpg_error_config_prefix"
+     if test x${GPG_ERROR_CONFIG+set} != xset ; then
+        GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config
+     fi
+  fi
+
+  AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
+  min_gpg_error_version=ifelse([$1], ,0.0,$1)
+  AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
+  ok=no
+  if test "$GPG_ERROR_CONFIG" != "no" ; then
+    req_major=`echo $min_gpg_error_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+    req_minor=`echo $min_gpg_error_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+    gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
+    major=`echo $gpg_error_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+    minor=`echo $gpg_error_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+    if test "$major" -gt "$req_major"; then
+        ok=yes
+    else 
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -ge "$req_minor"; then
+               ok=yes
+            fi
+        fi
+    fi
+  fi
+  if test $ok = yes; then
+    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
+    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+    AC_MSG_RESULT(yes)
+    ifelse([$2], , :, [$2])
+  else
+    GPG_ERROR_CFLAGS=""
+    GPG_ERROR_LIBS=""
+    AC_MSG_RESULT(no)
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GPG_ERROR_CFLAGS)
+  AC_SUBST(GPG_ERROR_LIBS)
+])
+

diff --git a/configure.in b/configure.in
index 0cd8537..c8a530c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -188,8 +188,26 @@ AC_ARG_ENABLE(ssl-link-static,
              [  --enable-static-ssl      Link with SSL library statically [default=no]],
              [enable_static_ssl=yes])
 
+AC_ARG_ENABLE(libgpg-error,
+              [  --enable-libgpg-error    Work around broken libgcrypt-config scripts],
+              enable_libgpg_error=yes, enable_libgpg_error=no)
+
+
 case $enable_ssl in
 yes)
+       libgpg_error_libs_static=""
+       libgpg_error_libs=""
+
+       if test "x$enable_libgpg_error" = "xyes"; then
+               AM_PATH_GPG_ERROR("0.4")
+               if test "x$GPG_ERROR_LIBS" = "x"; then
+                       AC_MSG_ERROR([libgpg-error is needed])
+               fi
+               gpg_error_prefix=$($GPG_ERROR_CONFIG --prefix)
+               libgpg_error_libs_static="$gpg_error_prefix/lib/libgpg-error.a"
+               libgpg_error_libs="$GPG_ERROR_LIBS"
+       fi
+
        AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
        case $LIBGNUTLS_CONFIG in
        no)
@@ -200,7 +218,7 @@ yes)
        esac
 
        GNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG --cflags | sed -e 's:-I/usr/include::'`
-       GNUTLS_LIBS=`$LIBGNUTLS_CONFIG --libs | sed -e 's:-L/usr/lib *::'`
+       GNUTLS_LIBS="`$LIBGNUTLS_CONFIG --libs | sed -e 's:-L/usr/lib *::'` $libgpg_error_libs"
 
        save_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
@@ -213,7 +231,7 @@ yes)
        case $enable_static_ssl in
        yes)
                gnutls_libdir=`$LIBGNUTLS_CONFIG --exec-prefix`/lib
-               GNUTLS_LIBS="$gnutls_libdir/libgnutls.a $gnutls_libdir/libgcrypt.a"
+               GNUTLS_LIBS="$gnutls_libdir/libgnutls.a $gnutls_libdir/libgcrypt.a $libgpg_error_libs_static"
                ;;
        esac