Upgraded from libpcre 4.3 to 6.3 - not tested on Windows yet

libpcre/configure.ac

@@ -1,7 +1,13 @@
+dnl Process this file with autoconf to produce a configure script.
+
 dnl This has been stripped down a bit by fyodor@insecure.org for
 dnl inclusion in Nmap (removed libtool and dynamic library stuff)
 
-dnl Process this file with autoconf to produce a configure script.
+dnl This configure.in file has been hacked around quite a lot as a result of
+dnl patches that various people have sent to me (PH). Sometimes the information
+dnl I get is contradictory. I've tried to put in comments that explain things,
+dnl but in some cases the information is second-hand and I have no way of
+dnl verifying it. I am not an autoconf or libtool expert!
 
 dnl This is required at the start; the name is the name of a file
 dnl it should be seeing, to verify it is in the same directory.
@@ -23,9 +29,9 @@ dnl macro, and may be treated as octal constants. Stick to single
 dnl digits for minor numbers less than 10. There are unlikely to be
 dnl that many releases anyway.
 
-PCRE_MAJOR=4
+PCRE_MAJOR=6
 PCRE_MINOR=3
-PCRE_DATE=21-May-2003
+PCRE_DATE=15-Aug-2005
 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR}
 
 dnl Default values for miscellaneous macros
@@ -41,6 +47,7 @@ PCRE_POSIXLIB_VERSION=0:0:0
 dnl Checks for programs.
 
 AC_PROG_CC
+
 AC_PROG_RANLIB
 
 dnl We need to find a compiler for compiling a program to run on the local host
@@ -48,12 +55,13 @@ dnl while building. It needs to be different from CC when cross-compiling.
 dnl There is a macro called AC_PROG_CC_FOR_BUILD in the GNU archive for
 dnl figuring this out automatically. Unfortunately, it does not work with the
 dnl latest versions of autoconf. So for the moment, we just default to the
-dnl same values as the "main" compiler. People who are corss-compiling will
+dnl same values as the "main" compiler. People who are cross-compiling will
 dnl just have to adjust the Makefile by hand or set these values when they
 dnl run "configure".
 
 CC_FOR_BUILD=${CC_FOR_BUILD:-'$(CC)'}
 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:-'$(CFLAGS)'}
+CPPFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:-'$(CPPFLAGS)'}
 BUILD_EXEEXT=${BUILD_EXEEXT:-'$(EXEEXT)'}
 BUILD_OBJEXT=${BUILD_OBJEXT:-'$(OBJEXT)'}
 
@@ -67,9 +75,14 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 
+AC_CHECK_TYPES([long long], [pcre_have_long_long="1"], [pcre_have_long_long="0"])
+AC_CHECK_TYPES([unsigned long long], [pcre_have_ulong_long="1"], [pcre_have_ulong_long="0"])
+AC_SUBST(pcre_have_long_long)
+AC_SUBST(pcre_have_ulong_long)
+
 dnl Checks for library functions.
 
-AC_CHECK_FUNCS(bcopy memmove strerror)
+AC_CHECK_FUNCS(bcopy memmove strerror strtoq strtoll)
 
 dnl Handle --enable-utf8
 
@@ -80,6 +93,15 @@ if test "$enableval" = "yes"; then
 fi
 )
 
+dnl Handle --enable-unicode-properties
+
+AC_ARG_ENABLE(unicode-properties,
+[  --enable-unicode-properties  enable Unicode properties support],
+if test "$enableval" = "yes"; then
+  UCP=-DSUPPORT_UCP
+fi
+)
+
 dnl Handle --enable-newline-is-cr
 
 AC_ARG_ENABLE(newline-is-cr,
@@ -98,6 +120,24 @@ if test "$enableval" = "yes"; then
 fi
 )
 
+dnl Handle --enable-ebcdic
+
+AC_ARG_ENABLE(ebcdic,
+[  --enable-ebcdic         assume EBCDIC coding rather than ASCII],
+if test "$enableval" == "yes"; then
+  EBCDIC=-DEBCDIC=1
+fi
+)
+
+dnl Handle --disable-stack-for-recursion
+
+AC_ARG_ENABLE(stack-for-recursion,
+[  --disable-stack-for-recursion  disable use of stack recursion when matching],
+if test "$enableval" = "no"; then
+  NO_RECURSE=-DNO_RECURSE
+fi
+)
+
 dnl There doesn't seem to be a straightforward way of having parameters
 dnl that set values, other than fudging the --with thing. So that's what
 dnl I've done.
@@ -123,17 +163,25 @@ AC_ARG_WITH(match-limit,
   MATCH_LIMIT=-DMATCH_LIMIT=$withval
 )
 
+dnl Unicode character property support implies UTF-8 support
+
+if test "$UCP" != "" ; then
+  UTF8=-DSUPPORT_UTF8
+fi
+
 dnl "Export" these variables
 
 AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CFLAGS_FOR_BUILD)
+AC_SUBST(EBCDIC)
 AC_SUBST(HAVE_MEMMOVE)
 AC_SUBST(HAVE_STRERROR)
 AC_SUBST(LINK_SIZE)
 AC_SUBST(MATCH_LIMIT)
 AC_SUBST(NEWLINE)
+AC_SUBST(NO_RECURSE)
 AC_SUBST(PCRE_MAJOR)
 AC_SUBST(PCRE_MINOR)
 AC_SUBST(PCRE_DATE)
@@ -141,16 +189,16 @@ AC_SUBST(PCRE_VERSION)
 AC_SUBST(PCRE_LIB_VERSION)
 AC_SUBST(PCRE_POSIXLIB_VERSION)
 AC_SUBST(POSIX_MALLOC_THRESHOLD)
+AC_SUBST(UCP)
 AC_SUBST(UTF8)
 
-
 AC_SUBST(POSIX_OBJ)
 AC_SUBST(POSIX_LOBJ)
 AC_SUBST(POSIX_LIB)
 
 if test "x$enable_shared" = "xno" ; then
-    AC_DEFINE(PCRE_STATIC,1)
+    AC_DEFINE([PCRE_STATIC],[1],[to link statically])
 fi
 
 dnl This must be last; it determines what files are written as well as config.h
-AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config:pcre-config.in,[chmod a+x pcre-config])
+AC_OUTPUT(Makefile pcre.h:pcre.in)