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

This commit is contained in:
George Joseph
2018-07-17 09:50:00 -05:00
committed by Gerrit Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -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

2
configure vendored
View File

@@ -10229,6 +10229,7 @@ fi
PBX_CURL=0
@@ -10568,7 +10569,6 @@ _ACEOF
else
unset CURL_LIB
unset CURL_INCLUDE
PBX_CURL=0
fi
fi