Newer versions of Automake want to include the test-driver script,

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 548a43daf628f1d3b3e823596b0fd37331f797df..94b2ec03073f9abaf65baa3614a38f558fc8e6c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,11 +43,6 @@ AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"],[
 dnl Do you want client-side support for using OAuth2 for SMTP authentication?
 AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],
   [Enable OAuth2 support in SMTP auth]))
-AS_IF([test x"$with_oauth" != x -a x"$with_oauth" != x"no"],[
-      AC_DEFINE([OAUTH_SUPPORT], [1],
-               [Support OAuth2 in SMTP auth.])dnl
-      OAUTH_SUPPORT=1; oauth_support=yes], [OAUTH_SUPPORT=0; oauth_support=no])
-AC_SUBST(OAUTH_SUPPORT)
 
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
@@ -492,18 +487,45 @@ AC_SUBST([TLSLIB])
 dnl -----------------
 dnl CHECK FOR CURL
 dnl -----------------
-AS_IF([test x"$OAUTH_SUPPORT" = x"1"],[
-  AC_PATH_PROG([curl_config], [curl-config])
-  AC_CHECK_HEADER([curl/curl.h], [], [AC_MSG_ERROR([curl/curl.h not found])])
-  AC_CHECK_LIB([curl], [curl_easy_init], [CURLLIB="`$curl_config --libs`"],
-    [AC_MSG_ERROR([curl library not found])],[$CURLLIB])
-  CURL_USER_AGENT=`$curl_config --version | sed 's| |/|'`
-  ],
-  [CURLLIB=
-   CURL_USER_AGENT=
-])
-AC_SUBST([CURLLIB])
-AC_SUBST([CURL_USER_AGENT])
+dnl Look for curl if oauth not disabled (--without-oauth).
+AC_PATH_PROG([curl_config], [curl-config])
+AS_IF([test "x$with_oauth" != xno && test -n "$curl_config"], [
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS `$curl_config --cflags`"
+    AC_CHECK_HEADER([curl/curl.h], [
+        HAVE_CURL_H=1
+        AC_CHECK_LIB([curl], [curl_easy_init], [
+            CURLLIB="`$curl_config --libs`"
+            AC_SUBST([CURLLIB])
+            CURL_USER_AGENT="`$curl_config --version | sed 's|^libcurl  *|libcurl/|; q'`"
+            AS_IF([test "x$CURL_USER_AGENT" != "x`echo $CURL_USER_AGENT | sed 's/ //'`"],
+                  [AC_MSG_WARN([unexpected curl-config --version: $CURL_USER_AGENT])
+                   CURL_USER_AGENT=libcurl/UNKNOWN])
+                   echo "HEYEPG ($CURL_USER_AGENT)"
+            AC_SUBST([CURL_USER_AGENT])
+          ])
+      ], [
+        CFLAGS="$save_CFLAGS"
+      ])
+  ])
+
+dnl -----------------
+dnl Enable OAuth?
+dnl -----------------
+dnl By default (with_oauth=''), enable OAuth if curl is found.
+dnl If OAuth requested (--with-oauth with_oauth=yes), error if curl not found.
+dnl If OAuth disabled (--without-oauth with_oauth=no), don't enable it.
+oauth_support=no
+OAUTH_SUPPORT=0
+AC_SUBST([OAUTH_SUPPORT])
+AS_IF([test "x$with_oauth" = xyes && test "x$HAVE_CURL_H" = x],
+      [AC_MSG_ERROR([OAuth requested but curl/curl.h not found])],
+      [test "x$with_oauth" = xyes && test "x$CURLLIB" = x],
+      [AC_MSG_ERROR([OAuth requested but curl library not found])],
+      [test "x$with_oauth" != xno && test "x$HAVE_CURL_H" = x1 && test "x$CURLLIB" != x],
+      [AC_DEFINE([OAUTH_SUPPORT], [1], [Support OAuth2 in SMTP auth.])
+       OAUTH_SUPPORT=1
+       oauth_support=yes])
 
 dnl ----------------
 dnl CHECK FLEX FIXUP
@@ -575,9 +597,10 @@ dnl We only use the expanded versions to print the install paths in
 dnl the final summary and should use them nowhere else (see the autoconf
 dnl docs for the rationale for bindir etc being unexpanded).
 eval "nmhbin=${bindir}";         eval "nmhbin=${nmhbin}"
-eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"
+eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
+eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"
 eval "nmhrpm=${nmhrpm}";
 
 AC_MSG_NOTICE([
@@ -594,6 +617,7 @@ binary install path        : ${nmhbin}
 libexec install path       : ${nmhlibexec}/nmh
 config files install path  : ${nmhsysconf}/nmh
 man page install path      : ${nmhman}
+docs install path          : ${nmhdoc}
 RPM build root             : ${nmhrpm}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}