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: 22-Aug-2010 00:18:39 Branch: HEAD Handle: 2010082122183701 Added files: pcre .cvsignore autogen.sh Modified files: pcre Makefile.am pcreposix.h Removed files: pcre Makefile.in aclocal.m4 configure install-sh Log: - remove the AutoCruft. Summary: Revision Changes Path 1.7 +38 -0 pcre/.cvsignore 1.5 +25 -21 pcre/Makefile.am 1.4 +0 -1493 pcre/Makefile.in 1.4 +0 -8862 pcre/aclocal.m4 1.4 +52 -0 pcre/autogen.sh 1.4 +0 -18722 pcre/configure 1.4 +0 -520 pcre/install-sh 1.7 +9 -4 pcre/pcreposix.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: pcre/.cvsignore ============================================================================ $ cvs diff -u -r0 -r1.7 .cvsignore --- /dev/null 2010-08-22 00:18:25.000000000 +0200 +++ .cvsignore 2010-08-22 00:18:38.481174795 +0200 @@ -0,0 +1,38 @@ +.deps +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.h +config.h.in +config.log +config.status +config.guess +config.sub +configure +install-sh +libpcre.pc +libpcrecpp.pc +libpcreposix.pc +libtool +ltmain.sh +pcre-config +pcre.h +pcre_stringpiece.h +pcrecpparg.h +stamp-h1 +.libs +*.gcda +*.gcno +*.la +*.lcd +*.lo +pcre_scanner_unittest +pcre_stringpiece_unittest +pcrecpp_unittest +pcregrep +pcretest +testNinput +testsavedregex +teststderr +testtry @@ . patch -p0 <<'@@ .' Index: pcre/Makefile.am ============================================================================ $ cvs diff -u -r1.4 -r1.5 Makefile.am --- pcre/Makefile.am 21 Aug 2010 21:51:38 -0000 1.4 +++ pcre/Makefile.am 21 Aug 2010 22:18:37 -0000 1.5 @@ -2,7 +2,11 @@ ACLOCAL_AMFLAGS = -I m4 -dist_doc_DATA = \ +dist_noinst_DATA = +noinst_DATA = +dist_noinst_MANS = + +dist_noinst_DATA = \ doc/pcre.txt \ doc/pcre-config.txt \ doc/pcregrep.txt \ @@ -14,7 +18,7 @@ NEWS \ README -dist_html_DATA = \ +dist_noinst_DATA = \ doc/html/index.html \ doc/html/pcre.html \ doc/html/pcre-config.html \ @@ -56,14 +60,14 @@ doc/html/pcretest.html pcrecpp_html = doc/html/pcrecpp.html -dist_noinst_DATA = $(pcrecpp_html) +dist_noinst_DATA += $(pcrecpp_html) if WITH_PCRE_CPP -html_DATA = $(pcrecpp_html) +noinst_DATA += $(pcrecpp_html) endif # The Libtool libraries to install. We'll add to this later. -lib_LTLIBRARIES = +noinst_LTLIBRARIES = # Unit tests you want to run when people type 'make check'. # TESTS is for binary unit tests, check_SCRIPTS for script-based tests @@ -120,24 +124,24 @@ # These are the header files we'll install. We do not distribute pcre.h because # it is generated from pcre.h.in. -nodist_include_HEADERS = \ +nodist_noinst_HEADERS = \ pcre.h -include_HEADERS = \ +noinst_HEADERS = \ pcreposix.h # These additional headers will be be installed if C++ support is enabled. We # do not distribute pcrecpparg.h or pcre_stringpiece.h, as these are generated # from corresponding .h.in files (which we do distribute). if WITH_PCRE_CPP -nodist_include_HEADERS += \ +nodist_noinst_HEADERS += \ pcrecpparg.h \ pcre_stringpiece.h -include_HEADERS += \ +noinst_HEADERS += \ pcrecpp.h \ pcre_scanner.h endif # WITH_PCRE_CPP -bin_SCRIPTS = pcre-config +noinst_SCRIPTS = pcre-config ## --------------------------------------------------------------- ## The dftables program is used to rebuild character tables before compiling @@ -163,7 +167,7 @@ ## The main pcre library -lib_LTLIBRARIES += libpcre.la +noinst_LTLIBRARIES += libpcre.la libpcre_la_SOURCES = \ pcre_compile.c \ pcre_config.c \ @@ -201,7 +205,7 @@ CLEANFILES += pcre_chartables.c ## A version of the main pcre library that has a posix re API. -lib_LTLIBRARIES += libpcreposix.la +noinst_LTLIBRARIES += libpcreposix.la libpcreposix_la_SOURCES = \ pcreposix.c libpcreposix_la_LDFLAGS = $(EXTRA_LIBPCREPOSIX_LDFLAGS) @@ -210,7 +214,7 @@ ## There's a C++ library as well. if WITH_PCRE_CPP -lib_LTLIBRARIES += libpcrecpp.la +noinst_LTLIBRARIES += libpcrecpp.la libpcrecpp_la_SOURCES = \ pcrecpp_internal.h \ pcrecpp.cc \ @@ -244,15 +248,15 @@ TESTS += RunTest dist_noinst_SCRIPTS += RunTest EXTRA_DIST += RunTest.bat -bin_PROGRAMS += pcretest +noinst_PROGRAMS += pcretest pcretest_SOURCES = pcretest.c -pcretest_LDADD = libpcreposix.la $(LIBREADLINE) +pcretest_LDADD = libpcreposix.la TESTS += RunGrepTest dist_noinst_SCRIPTS += RunGrepTest -bin_PROGRAMS += pcregrep +noinst_PROGRAMS += pcregrep pcregrep_SOURCES = pcregrep.c -pcregrep_LDADD = libpcreposix.la $(LIBZ) $(LIBBZ2) +pcregrep_LDADD = libpcreposix.la EXTRA_DIST += \ testdata/grepinput \ @@ -334,12 +338,12 @@ # We have .pc files for pkg-config users. pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libpcre.pc libpcreposix.pc +noinst_DATA = libpcre.pc libpcreposix.pc if WITH_PCRE_CPP -pkgconfig_DATA += libpcrecpp.pc +noinst_DATA += libpcrecpp.pc endif -dist_man_MANS = \ +dist_noinst_MANS = \ doc/pcre.3 \ doc/pcre-config.1 \ doc/pcre_compile.3 \ @@ -382,7 +386,7 @@ EXTRA_DIST += $(pcrecpp_man) if WITH_PCRE_CPP -man_MANS = $(pcrecpp_man) +noinst_MANS = $(pcrecpp_man) endif ## CMake support @@ . rm -f pcre/Makefile.in <<'@@ .' Index: pcre/Makefile.in ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f pcre/aclocal.m4 <<'@@ .' Index: pcre/aclocal.m4 ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: pcre/autogen.sh ============================================================================ $ cvs diff -u -r0 -r1.4 autogen.sh --- /dev/null 2010-08-22 00:18:25.000000000 +0200 +++ autogen.sh 2010-08-22 00:18:38.831194313 +0200 @@ -0,0 +1,52 @@ +#!/bin/sh + +# configure the requirements +AMV="automake (GNU automake) 1.11" +ACV="autoconf (GNU Autoconf) 2.63" +LTV="libtoolize (GNU libtool) 2.2.6" +GTT="gettextize (GNU gettext-tools) 0.17" +USAGE=" +To build RPM from plain CVS sources the following +installed developer tools are mandatory: + $AMV + $ACV + $LTV + $GTT +" + +# wrapper for running GNU libtool's libtoolize(1) +libtoolize () { + _libtoolize=`which glibtoolize 2>/dev/null` + _libtoolize_args="$*" + case "$_libtoolize" in + /* ) ;; + * ) _libtoolize=`which libtoolize 2>/dev/null` + case "$_libtoolize" in + /* ) ;; + * ) _libtoolize="libtoolize" ;; + esac + ;; + esac + _libtoolize_version="`$_libtoolize --version | sed -e '1q' | sed -e 's;^[^0-9]*;;'`" + case "$_libtoolize_version" in + 1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed -e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;; + esac + eval $_libtoolize $_libtoolize_args +} + +# requirements sanity check +[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1 +[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1 +[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1 +[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1 + +echo "---> generate files via GNU libtool (libtoolize)" +libtoolize --quiet --copy --force --install +echo "---> generate files via GNU autoconf (aclocal, autoheader)" +aclocal +autoheader +echo "---> generate files via GNU automake (automake)" +automake -Wall -Wno-override -a -c +echo "---> generate files via GNU autoconf (autoconf)" +autoconf + @@ . rm -f pcre/configure <<'@@ .' Index: pcre/configure ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f pcre/install-sh <<'@@ .' Index: pcre/install-sh ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: pcre/pcreposix.h ============================================================================ $ cvs diff -u -r1.6 -r1.7 pcreposix.h --- pcre/pcreposix.h 21 Aug 2010 21:51:38 -0000 1.6 +++ pcre/pcreposix.h 21 Aug 2010 22:18:38 -0000 1.7 @@ -133,11 +133,16 @@ /* The functions */ -PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); -PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, +PCREPOSIX_EXP_DECL int pcre_regcomp(regex_t *, const char *, int); +PCREPOSIX_EXP_DECL int pcre_regexec(const regex_t *, const char *, size_t, regmatch_t *, int); -PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t); -PCREPOSIX_EXP_DECL void regfree(regex_t *); +PCREPOSIX_EXP_DECL size_t pcre_regerror(int, const regex_t *, char *, size_t); +PCREPOSIX_EXP_DECL void pcre_regfree(regex_t *); + +#define regcomp pcreposix_regcomp +#define regexec pcreposix_regexec +#define regerror pcreposix_regerror +#define regfree pcreposix_regfree #ifdef __cplusplus } /* extern "C" */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org