Merge "Fix declaration of PBX_CURL for ./configure --without-libcurl"

7 years ago · 2ce66f6a66
parent 2553255ace 0885ab8afc
commit 2ce66f6a66
2 changed files with 2 additions and 3 deletions
--- a/autoconf/libcurl.m4
+++ b/autoconf/libcurl.m4
@ -80,7 +80,7 @@ AC_DEFUN([AST_LIBCURL_CHECK_CONFIG],
  AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3])
  AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP])
  AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
-  AC_SUBST(PBX_CURL)
+  AC_SUBST(PBX_CURL, 0)

  AC_ARG_WITH(libcurl,
     AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
@ -248,7 +248,6 @@ if (x) {;}
        else
           unset CURL_LIB
           unset CURL_INCLUDE
-           PBX_CURL=0
        fi
     fi

--- a/2
+++ b/2
@ -10247,6 +10247,7 @@ fi



+  PBX_CURL=0



@ -10586,7 +10587,6 @@ _ACEOF
        else
           unset CURL_LIB
           unset CURL_INCLUDE
-           PBX_CURL=0
        fi
     fi