fix up the configure checks for pcre and curl (compile always now)
This commit is contained in:
parent
ef2794dc23
commit
7b4a2fad05
6 changed files with 275 additions and 8125 deletions
|
@ -79,7 +79,7 @@ AC_DEFUN([TYPE_IN_ADDR_T],
|
|||
#include <sys/socket.h>
|
||||
#include <arpa/inet.h>])
|
||||
])
|
||||
AC_DEFUN(CURL_CHECK_NONBLOCKING_SOCKET,
|
||||
AC_DEFUN([CURL_CHECK_NONBLOCKING_SOCKET],
|
||||
[
|
||||
AC_MSG_CHECKING([non-blocking sockets style])
|
||||
|
||||
|
@ -243,3 +243,8 @@ define(ADNS_C_GETFUNC,[
|
|||
])
|
||||
])
|
||||
])
|
||||
AC_DEFUN([AC_MSG_HEADER], [
|
||||
echo ""
|
||||
autotools/shtool echo -e "%B$1%b"
|
||||
echo ""
|
||||
])
|
|
@ -1,4 +1,9 @@
|
|||
AC_DEFUN([AX_PATH_LIB_CURL], [dnl
|
||||
AC_MSG_HEADER([Configuring for LibCurl Now])
|
||||
AX_CONFIG_LIB_CURL
|
||||
])
|
||||
|
||||
AC_DEFUN([AX_PATH_LIB_CURL_UNUSED], [dnl
|
||||
AC_MSG_CHECKING([lib curl])
|
||||
AC_ARG_WITH(curl,
|
||||
[ --with-curl[[=prefix]] compile libcurl part ],,
|
||||
|
@ -151,5 +156,4 @@ CURL_CFLAGS='-I${top_srcdir}/'lib/curl
|
|||
AC_SUBST([CURL_LIBS])
|
||||
AC_SUBST([CURL_CFLAGS])
|
||||
AM_CONDITIONAL(BUILD_CURL, true)
|
||||
AC_MSG_RESULT([ok])
|
||||
])
|
||||
|
|
|
@ -13,9 +13,12 @@ dnl @$Id: $
|
|||
|
||||
|
||||
AC_DEFUN([AX_PATH_LIB_PCRE], [dnl
|
||||
AC_MSG_CHECKING([lib pcre])
|
||||
AC_MSG_HEADER([Configuring for libpcre now])
|
||||
AX_CONFIG_LIB_PCRE
|
||||
])
|
||||
AC_DEFUN([AX_PATH_LIB_PCRE_NOTUSED], [dnl
|
||||
AC_ARG_WITH(pcre,
|
||||
[ --with-pcre[[=prefix]] compile xmlpcre part (via libpcre check)],,
|
||||
[ --with-pcre[[=prefix]] compile xmlpcre part (via libpcre check)],,
|
||||
with_pcre="yes")
|
||||
if test ".$with_pcre" = ".no" ; then
|
||||
AC_MSG_RESULT([disabled])
|
||||
|
@ -33,6 +36,7 @@ else
|
|||
AC_MSG_RESULT([$PCRE_LIBS])
|
||||
m4_ifval($1,$1)
|
||||
AM_CONDITIONAL(BUILD_PCRE, false)
|
||||
AC_CHECK_HEADERS(pcre.h)
|
||||
if eval pcre-config --cflags 2>/dev/null >/dev/null; then
|
||||
PCRE_CFLAGS=`pcre-config --cflags`
|
||||
PCRE_LIBS=`pcre-config --libs`
|
||||
|
@ -46,9 +50,10 @@ else
|
|||
CPPFLAGS="$OLDCPPFLAGS"
|
||||
LDFLAGS="$OLDLDFLAGS"
|
||||
if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
|
||||
AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre)
|
||||
AC_MSG_RESULT(setting PCRE_LIBS -L$with_pcre/lib -lpcre)
|
||||
PCRE_LIBS="-L$with_pcre/lib -lpcre"
|
||||
test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include"
|
||||
AC_CHECK_HEADERS(pcre.h)
|
||||
AC_MSG_CHECKING([lib pcre])
|
||||
AC_MSG_RESULT([$PCRE_LIBS])
|
||||
m4_ifval($1,$1)
|
||||
|
@ -66,7 +71,6 @@ AC_SUBST([PCRE_CFLAGS])
|
|||
])
|
||||
|
||||
AC_DEFUN([AX_CONFIG_LIB_PCRE],[dnl
|
||||
AC_MSG_CHECKING([How to build a local pcre])
|
||||
dnl PCRE options
|
||||
NPCRE_MAJOR_VERSION=4
|
||||
NPCRE_MINOR_VERSION=3
|
||||
|
@ -75,7 +79,7 @@ NPCRE_VERSION=$PCRE_MAJOR_VERSION.$PCRE_MINOR_VERSION
|
|||
AC_DEFINE(LINK_SIZE, 2, "PCRE Lnk size")
|
||||
AC_DEFINE(POSIX_MALLOC_THRESHOLD, 5, "Malloc Threshold")
|
||||
AC_DEFINE(MATCH_LIMIT, 10000000, "PCRE Match limit")
|
||||
|
||||
AC_DEFINE(USE_LOCAL_PCRE, 1, "Use the local copy of PCRE")
|
||||
AC_DEFINE(PCRE_MAJOR_VERSION, $NPCRE_MAJOR_VERSION, "PCRE Version")
|
||||
AC_DEFINE(PCRE_MINOR_VERSION, NPCRE_MINOR_VERSION, "PCRE Version")
|
||||
AC_DEFINE(PCRE_VERSION, NPCRE_VERSION, "Pcre full version")
|
||||
|
|
4298
autotools/ccdv.m4
4298
autotools/ccdv.m4
File diff suppressed because it is too large
Load diff
44
configure.in
44
configure.in
|
@ -24,6 +24,7 @@ AC_DEFINE_UNQUOTED(MAJOR, $x_maj, "Major Version Number")
|
|||
AC_DEFINE_UNQUOTED(MINOR, $x_min, "Minor Version Number")
|
||||
AC_DEFINE_UNQUOTED(REV, $x_rev, "Revision Version Number")
|
||||
AC_DEFINE_UNQUOTED(VERSION, $x_version, "Full Version")
|
||||
AC_MSG_HEADER([Configuring Core Now])
|
||||
AC_LIBTOOL_DLOPEN
|
||||
dnl AC_DISABLE_SHARED
|
||||
dnl AC_LIBTOOL_WIN32_DLL
|
||||
|
@ -261,6 +262,28 @@ AC_CACHE_CHECK([for __va_copy], ns___va_copy, [AC_LINK_IFELSE(
|
|||
if test "$ns___va_copy" = "yes" ; then
|
||||
AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) fi
|
||||
|
||||
|
||||
dnl Set NEO_PREFIX in config.h.
|
||||
if test "x${prefix}" = "xNONE"; then
|
||||
AC_DEFINE_UNQUOTED(NEO_PREFIX, "${ac_default_prefix}", "Installation Prefix")
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(NEO_PREFIX, "${prefix}", "Installation Prefix")
|
||||
fi
|
||||
|
||||
|
||||
|
||||
AX_PATH_LIB_PCRE
|
||||
AX_PATH_LIB_CURL
|
||||
|
||||
AC_DEFINE_UNQUOTED(NS_HOST, "$host_os", "Operating System Host")
|
||||
AC_MSG_HEADER([Configuring CCDV Now])
|
||||
wi_ARG_DISABLE_CCDV
|
||||
wi_PROG_CCDV
|
||||
AC_MSG_HEADER([Configuring LibEvent Now])
|
||||
CHK_LIBEVNT
|
||||
|
||||
AC_MSG_HEADER([NeoStats Configuration Summary:])
|
||||
|
||||
dnl check if we are running with Debug....
|
||||
AC_MSG_CHECKING(Whether to Enable Debuging...)
|
||||
AC_ARG_ENABLE(debug,
|
||||
|
@ -320,25 +343,6 @@ MODULES="$MODULES $withval"
|
|||
AC_MSG_RESULT($withval),
|
||||
AC_MSG_RESULT("None"))
|
||||
|
||||
dnl Set NEO_PREFIX in config.h.
|
||||
if test "x${prefix}" = "xNONE"; then
|
||||
AC_DEFINE_UNQUOTED(NEO_PREFIX, "${ac_default_prefix}", "Installation Prefix")
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(NEO_PREFIX, "${prefix}", "Installation Prefix")
|
||||
fi
|
||||
|
||||
|
||||
|
||||
AX_PATH_LIB_PCRE
|
||||
AX_PATH_LIB_CURL
|
||||
|
||||
AC_DEFINE_UNQUOTED(NS_HOST, "$host_os", "Operating System Host")
|
||||
|
||||
wi_ARG_DISABLE_CCDV
|
||||
wi_PROG_CCDV
|
||||
|
||||
CHK_LIBEVNT
|
||||
|
||||
|
||||
AC_SUBST(PROTOCOL)
|
||||
AC_SUBST(SED)
|
||||
|
@ -370,7 +374,7 @@ AC_CONFIG_FILES([Makefile
|
|||
|
||||
AC_CACHE_SAVE
|
||||
AC_OUTPUT
|
||||
echo "Configuration complete."
|
||||
AC_MSG_HEADER([Configuration complete.])
|
||||
read -p "Press Enter key to read the release notes"
|
||||
clear
|
||||
more RELNOTES
|
||||
|
|
Reference in a new issue