RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: pcre Date: 26-Oct-2010 05:07:16
Branch: HEAD Handle: 2010102603071600
Modified files:
pcre autogen.sh configure.ac
Log:
- eliminate AutoFu nags.
Summary:
Revision Changes Path
1.6 +1 -1 pcre/autogen.sh
1.2 +134 -40 pcre/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: pcre/autogen.sh
============================================================================
$ cvs diff -u -r1.5 -r1.6 autogen.sh
--- pcre/autogen.sh 27 Sep 2010 17:08:42 -0000 1.5
+++ pcre/autogen.sh 26 Oct 2010 03:07:16 -0000 1.6
@@ -2,7 +2,7 @@
# configure the requirements
AMV="automake (GNU automake) 1.11.1"
-ACV="autoconf (GNU Autoconf) 2.63"
+ACV="autoconf (GNU Autoconf) 2.68"
LTV="libtoolize (GNU libtool) 2.2.10"
GTT="gettextize (GNU gettext-tools) 0.17"
USAGE="
@@ .
patch -p0 <<'@@ .'
Index: pcre/configure.ac
============================================================================
$ cvs diff -u -r1.1.1.4 -r1.2 configure.ac
--- pcre/configure.ac 21 Aug 2010 21:48:05 -0000 1.1.1.4
+++ pcre/configure.ac 26 Oct 2010 03:07:16 -0000 1.2
@@ -68,7 +68,7 @@
# AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
# Check for that case, and just disable c++ code if g++ doesn't run.
AC_LANG_PUSH(C++)
-AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="")
+AC_COMPILE_IFELSE([AC_LANG_SOURCE(AC_LANG_PROGRAM([],[]))],, CXX="";
CXXCP=""; CXXFLAGS="")
AC_LANG_POP
# Check for a 64-bit integer type
@@ -320,11 +320,11 @@
LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
# We try to run the linker with this new ld flag. If the link fails,
# we give up and remove the new flag from LDFLAGS.
- AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp {
+ AC_LINK_IFELSE( [AC_LANG_SOURCE( AC_LANG_PROGRAM([namespace pcrecpp {
class RE { static int no_arg; };
int RE::no_arg;
}],
- []),
+ []) )],
[AC_MSG_RESULT([yes]);
EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS
-Wl,$flag";
break;],
@@ -361,8 +361,8 @@
else
include=stdlib.h
fi
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <$include>],
- [char* e; return $fn("100", &e, 10)]),
+ AC_COMPILE_IFELSE( [AC_LANG_SOURCE( AC_LANG_PROGRAM([#include <$include>],
+ [char* e; return $fn("100", &e, 10)]) )],
[AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr
abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,
[Define to 1 if you have `$fn'.])
@@ -434,11 +434,11 @@
AC_MSG_CHECKING([for libbz2])
OLD_LIBS="$LIBS"
LIBS="$LIBS -lbz2"
-AC_LINK_IFELSE( AC_LANG_PROGRAM([[
+AC_LINK_IFELSE( [AC_LANG_SOURCE( AC_LANG_PROGRAM([[
#ifdef HAVE_BZLIB_H
#include <bzlib.h>
#endif]],
-[[return (int)BZ2_bzopen("conftest", "rb");]]),
+[[return (int)BZ2_bzopen("conftest", "rb");]]) )],
[AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
AC_MSG_RESULT([no]))
LIBS="$OLD_LIBS"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
