# # # patch ".mtn-ignore" # from [277f992ed04060f8b149c746a8575066c3a9240f] # to [e97ced7acc9976e11bf1986d1613fa9be9704fad] # # patch "pcre/Makefile.am" # from [528e12a68cb3126ff7d9be07c9191af9563c7603] # to [f8ace4c2cda7a35f4f39816f43f81f2f4bdfd292] # # patch "pcre/configure.ac" # from [5572186007517c995ada22a89658b3bf65a5b8b2] # to [602744c964f8685348004e6f6a43553faa179664] # ============================================================ --- .mtn-ignore 277f992ed04060f8b149c746a8575066c3a9240f +++ .mtn-ignore e97ced7acc9976e11bf1986d1613fa9be9704fad @@ -1,29 +1,31 @@ -\.dirstamp$ -^ABOUT-NLS$ +^\.dirstamp$ +/\.(dirstamp|deps)$ /Makefile(\.in)?$ +^aclocal\.m4$ /aclocal\.m4$ -^aclocal\.m4$ +/configure$ +^configure$ +^config\.(guess|h(\.in)?|log|rpath|status|sub)$ +/config\.(h(\.in)?|log|status)$ ^build-arch-stamp$ ^build-indep-stamp$ ^compile$ -^config\.(guess|h(\.in)?|log|rpath|status|sub)$ -/configure$ -^configure$ +^depcomp$ +^install-sh$ +^mdate-sh$ +^missing$ +^mkinstalldirs$ ^debian/files$ ^debian/monotone ^debian/monotone\.substvars$ -^depcomp$ -^html -^install-sh$ -^lua_tests\.status$ ^m4/codeset\.m4$ ^m4/gettext\.m4$ ^m4/glibc21\.m4$ ^m4/iconv\.m4$ ^m4/intdiv0\.m4$ -^m4/inttypes-pri\.m4$ +^m4/inttypes_h\.m4$ ^m4/inttypes\.m4$ -^m4/inttypes_h\.m4$ +^m4/inttypes-pri\.m4$ ^m4/isc-posix\.m4$ ^m4/lcmessage\.m4$ ^m4/lib-ld\.m4$ @@ -33,36 +35,36 @@ ^m4/stdint_h\.m4$ ^m4/uintmax_t\.m4$ ^m4/ulonglong\.m4$ +^monotone/ABOUT-NLS$ +^monotone/html +^monotone/lua_tests\.status$ +^monotone/monotone\.(cps?|fn|ky|pg|tp|vr|toc|pdf|ps|dvi|log|info(-[0-9]+)?)$ +^monotone/mtn$ +^monotone/package_(full_)?revision(\.c|\.txt|_(dist|raw)\.txt)$ +^monotone/po/boldquot\.sed$ +^monotone/po/address@hidden +^monotone/po/address@hidden +^monotone/po/insert-header\.sin$ +^monotone/po/Makefile(\.in)*$ +^monotone/po/monotone\.pot$ +^monotone/po/POTFILES$ +^monotone/po/quot\.sed$ +^monotone/po/Rules-quot$ +^monotone/run_lua_tests$ +^monotone/run_tester_tests$ +^monotone/run_unit_tests$ +^monotone/schema\.c$ +^monotone/stamp-h1$ +^monotone/stamp-vti$ +^monotone/std_hooks\.c$ +^monotone/tester$ +^monotone/tester_dir$ +^monotone/tester_tests\.status$ +^monotone/test_hooks\.c$ +^monotone/testlib\.c$ +^monotone/texinfo\.tex$ +^monotone/txt2c$ +^monotone/unit_tester$ +^monotone/unit-tests$ +^monotone/unit_tests\.status$ +^monotone/version\.texi$ -^mdate-sh$ -^missing$ -^mkinstalldirs$ -^monotone\.(cps?|fn|ky|pg|tp|vr|toc|pdf|ps|dvi|log|info(-[0-9]+)?)$ -^mtn$ -^package_(full_)?revision(\.c|\.txt|_(dist|raw)\.txt)$ -^po/Makefile(\.in)*$ -^po/POTFILES$ -^po/Rules-quot$ -^po/boldquot\.sed$ -^po/address@hidden -^po/address@hidden -^po/insert-header\.sin$ -^po/monotone\.pot$ -^po/quot\.sed$ -^run_lua_tests$ -^run_tester_tests$ -^run_unit_tests$ -^schema\.c$ -^stamp-h1$ -^stamp-vti$ -^std_hooks\.c$ -^test_hooks\.c$ -^tester$ -^tester_dir$ -^tester_tests\.status$ -^testlib\.c$ -^texinfo\.tex$ -^txt2c$ -^unit-tests$ -^unit_tester$ -^unit_tests\.status$ -^version\.texi$ ============================================================ --- pcre/Makefile.am 528e12a68cb3126ff7d9be07c9191af9563c7603 +++ pcre/Makefile.am f8ace4c2cda7a35f4f39816f43f81f2f4bdfd292 @@ -1,123 +1,39 @@ ## Process this file with automake to produce Makefile.in. ## MONOTONE: All irrelevant functionality has been removed from this file. ## MONOTONE: See README.monotone for details. -# The Libtool libraries to install. We'll add to this later. -lib_LTLIBRARIES = +# The library to install. +lib_LIBRARIES = libpcre.a +libpcre_a_SOURCES = pcre_chartables.c pcre_compile.c pcre_config.c \ + pcre_dfa_exec.c pcre_exec.c pcre_fullinfo.c pcre_get.c \ + pcre_globals.c pcre_info.c pcre_internal.h pcre_maketables.c \ + pcre_printint.src pcre_newline.c pcre_ord2utf8.c pcre_refcount.c \ + pcre_study.c pcre_tables.c pcre_try_flipped.c pcre_ucp_searchfuncs.c \ + pcre_valid_utf8.c pcre_version.c pcre_xclass.c ucp.h ucpinternal.h \ + ucptable.h -# Unit tests you want to run when people type 'make check'. -# TESTS is for binary unit tests, check_SCRIPTS for script-based tests -TESTS = -check_SCRIPTS = -dist_noinst_SCRIPTS = - -# Some of the binaries we make are to be installed, and others are -# (non-user-visible) helper programs needed to build libpcre. -bin_PROGRAMS = -noinst_PROGRAMS = - -# Additional files to delete on 'make clean' and 'make maintainer-clean'. -CLEANFILES = -MAINTAINERCLEANFILES = - -# These are the header files we'll install. -nodist_include_HEADERS = pcre.h - # We have .pc files for pkg-config users. pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libpcre.pc bin_SCRIPTS = pcre-config -## The main pcre library -lib_LTLIBRARIES += libpcre.la -libpcre_la_SOURCES = \ - pcre_compile.c \ - pcre_config.c \ - pcre_dfa_exec.c \ - pcre_exec.c \ - pcre_fullinfo.c \ - pcre_get.c \ - pcre_globals.c \ - pcre_info.c \ - pcre_internal.h \ - pcre_maketables.c \ - pcre_newline.c \ - pcre_ord2utf8.c \ - pcre_refcount.c \ - pcre_study.c \ - pcre_tables.c \ - pcre_try_flipped.c \ - pcre_ucp_searchfuncs.c \ - pcre_valid_utf8.c \ - pcre_version.c \ - pcre_xclass.c \ - ucp.h \ - ucpinternal.h \ - ucptable.h \ - pcre_chartables.c +# These are the header files we'll install. +include_HEADERS = pcre.h -# The pcre_printint.src file is #included by some source files, so it must be -# distributed. -EXTRA_DIST += pcre_printint.src - -libpcre_la_LDFLAGS = $(EXTRA_LIBPCRE_LDFLAGS) - -## The main unit tests - +# Unit tests you want to run when people type 'make check'. # Each unit test is a binary plus a script that runs that binary in various # ways. We install these test binaries in case folks find it helpful. -TESTS += RunTest -dist_noinst_SCRIPTS += RunTest -EXTRA_DIST += RunTest.bat -bin_PROGRAMS += pcretest +TESTS = RunTest RunGrepTest +noinst_SCRIPTS = RunTest RunGrepTest +bin_PROGRAMS = pcretest pcregrep + pcretest_SOURCES = pcretest.c -pcretest_LDADD = libpcreposix.la +pcretest_LDADD = libpcre.a -TESTS += RunGrepTest -dist_noinst_SCRIPTS += RunGrepTest -bin_PROGRAMS += pcregrep pcregrep_SOURCES = pcregrep.c -pcregrep_LDADD = libpcreposix.la +pcregrep_LDADD = libpcre.a +# Additional files to delete on 'make clean'. +CLEANFILES = testsavedregex teststderr testtry testNinput -EXTRA_DIST += \ - testdata/grepinput \ - testdata/grepinput8 \ - testdata/grepinputv \ - testdata/grepinputx \ - testdata/greplist \ - testdata/grepoutput \ - testdata/grepoutput8 \ - testdata/grepoutputN \ - testdata/testinput1 \ - testdata/testinput2 \ - testdata/testinput3 \ - testdata/testinput4 \ - testdata/testinput5 \ - testdata/testinput6 \ - testdata/testinput7 \ - testdata/testinput8 \ - testdata/testinput9 \ - testdata/testinput10 \ - testdata/testoutput1 \ - testdata/testoutput2 \ - testdata/testoutput3 \ - testdata/testoutput4 \ - testdata/testoutput5 \ - testdata/testoutput6 \ - testdata/testoutput7 \ - testdata/testoutput8 \ - testdata/testoutput9 \ - testdata/testoutput10 \ - testdata/wintestinput3 \ - testdata/wintestoutput3 \ - perltest.pl - -CLEANFILES += \ - testsavedregex \ - teststderr \ - testtry \ - testNinput - -## end Makefile.am ============================================================ --- pcre/configure.ac 5572186007517c995ada22a89658b3bf65a5b8b2 +++ pcre/configure.ac 602744c964f8685348004e6f6a43553faa179664 @@ -6,6 +6,11 @@ dnl empty. dnl be defined as -RC2, for example. For real releases, it should be defined dnl empty. +dnl MONOTONE: Much irrelevant or outright undesirable functionality +dnl MONOTONE: has been removed from this file. However, harmless +dnl MONOTONE: configure options have been left alone, even when we +dnl MONOTONE: don't use them. + m4_define(pcre_major, [7]) m4_define(pcre_minor, [6]) m4_define(pcre_prerelease, []) @@ -19,57 +24,14 @@ AC_CONFIG_SRCDIR([pcre.h.in]) AC_PREREQ(2.57) AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre) AC_CONFIG_SRCDIR([pcre.h.in]) -dnl MONOTONE: look for helper files in parent directory; disable -dnl MONOTONE: automake's sanity checking and "make dist". AC_CONFIG_AUX_DIR([..]) AC_CONFIG_MACRO_DIR([../m4]) -AM_INIT_AUTOMAKE([foreign no-dist]) -dnl MONOTONE: end modifications. +AM_INIT_AUTOMAKE([1.7.1 foreign no-dist no-define]) AC_CONFIG_HEADERS(config.h) -# The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just -# "-g" for any other compiler. There doesn't seem to be a standard way of -# getting rid of the -g (which I don't think is needed for a production -# library). This fudge seems to achieve the necessary. First, we remember the -# externally set values of CFLAGS and CXXFLAGS. Then call the AC_PROG_CC and -# AC_PROG_CXX macros to find the compilers - if CFLAGS and CXXFLAGS are not -# set, they will be set to Autoconf's defaults. Afterwards, if the original -# values were not set, remove the -g from the Autoconf defaults. -# (PH 02-May-07) - -remember_set_CFLAGS="$CFLAGS" -remember_set_CXXFLAGS="$CXXFLAGS" - AC_PROG_CC -AC_PROG_CXX - -if test "x$remember_set_CFLAGS" = "x" -then - if test "$CFLAGS" = "-g -O2" - then - CFLAGS="-O2" - elif test "$CFLAGS" = "-g" - then - CFLAGS="" - fi -fi - -if test "x$remember_set_CXXFLAGS" = "x" -then - if test "$CXXFLAGS" = "-g -O2" - then - CXXFLAGS="-O2" - elif test "$CXXFLAGS" = "-g" - then - CXXFLAGS="" - fi -fi - - AC_PROG_INSTALL -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL -AC_PROG_LN_S +AC_PROG_RANLIB PCRE_MAJOR="pcre_major" PCRE_MINOR="pcre_minor" @@ -81,48 +43,24 @@ AC_SUBST(PCRE_DATE) AC_SUBST(PCRE_PRERELEASE) AC_SUBST(PCRE_DATE) -# Set a more sensible default value for $(htmldir). -if test "x$htmldir" = 'x${docdir}' -then - htmldir='${docdir}/html' -fi - # Handle --disable-cpp -dnl MONOTONE: C++ support left out of import. -dnl AC_ARG_ENABLE(cpp, -dnl AS_HELP_STRING([--disable-cpp], -dnl [disable C++ support]), -dnl , enable_cpp=yes) enable_cpp=no # Handle --enable-rebuild-chartables -dnl MONOTONE: rebuild-chartables not allowed. -dnl AC_ARG_ENABLE(rebuild-chartables, -dnl AS_HELP_STRING([--enable-rebuild-chartables], -dnl [rebuild character tables in current locale]), -dnl , enable_rebuild_chartables=no) enable_rebuild_chartables=no # Handle --enable-utf8 (disabled by default) -# MONOTONE: we flip the sign of this. AC_ARG_ENABLE(utf8, AS_HELP_STRING([--enable-utf8], [enable UTF-8 support]), , enable_utf8=yes) # Handle --enable-unicode-properties -# MONOTONE: we flip the sign of this. AC_ARG_ENABLE(unicode-properties, AS_HELP_STRING([--enable-unicode-properties], [enable Unicode properties support (implies --enable-utf8)]), , enable_unicode_properties=yes) -# Handle --enable-newline=NL -dnl AC_ARG_ENABLE(newline, -dnl AS_HELP_STRING([--enable-newline=NL], -dnl [use NL as newline (lf, cr, crlf, anycrlf, any; default=lf)]), -dnl , enable_newline=lf) - # Separate newline options ac_pcre_newline=lf AC_ARG_ENABLE(newline-is-cr, @@ -154,10 +92,7 @@ AC_ARG_ENABLE(bsr-anycrlf, , enable_bsr_anycrlf=no) # Handle --enable-ebcdic -AC_ARG_ENABLE(ebcdic, - AS_HELP_STRING([--enable-ebcdic], - [assume EBCDIC coding rather than ASCII; use this only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]), - , enable_ebcdic=no) +enable_ebcdic=no # Handle --disable-stack-for-recursion AC_ARG_ENABLE(stack-for-recursion, @@ -166,22 +101,13 @@ AC_ARG_ENABLE(stack-for-recursion, , enable_stack_for_recursion=yes) # Handle --enable-pcregrep-libz -AC_ARG_ENABLE(pcregrep-libz, - AS_HELP_STRING([--enable-pcregrep-libz], - [link pcregrep with libz to handle .gz files]), - , enable_pcregrep_libz=no) +enable_pcregrep_libz=no # Handle --enable-pcregrep-libbz2 -AC_ARG_ENABLE(pcregrep-libbz2, - AS_HELP_STRING([--enable-pcregrep-libbz2], - [link pcregrep with libbz2 to handle .bz2 files]), - , enable_pcregrep_libbz2=no) +enable_pcregrep_libbz2=no # Handle --enable-pcretest-libreadline -AC_ARG_ENABLE(pcretest-libreadline, - AS_HELP_STRING([--enable-pcretest-libreadline], - [link pcretest with libreadline]), - , enable_pcretest_libreadline=no) +enable_pcretest_libreadline=no # Handle --with-posix-malloc-threshold=NBYTES AC_ARG_WITH(posix-malloc-threshold, @@ -281,33 +207,6 @@ AC_CHECK_HEADERS(limits.h sys/types.h sy AC_HEADER_STDC AC_CHECK_HEADERS(limits.h sys/types.h sys/stat.h dirent.h windows.h) -# The files below are C++ header files. -pcre_have_type_traits="0" -pcre_have_bits_type_traits="0" -if test "x$enable_cpp" = "xyes" -a -n "$CXX" -then -AC_LANG_PUSH(C++) - -# We could be more clever here, given we're doing AC_SUBST with this -# (eg set a var to be the name of the include file we want). But we're not -# so it's easy to change back to 'regular' autoconf vars if we needed to. -AC_CHECK_HEADERS(string, [pcre_have_cpp_headers="1"], - [pcre_have_cpp_headers="0"]) -AC_CHECK_HEADERS(bits/type_traits.h, [pcre_have_bits_type_traits="1"], - [pcre_have_bits_type_traits="0"]) -AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"], - [pcre_have_type_traits="0"]) -AC_LANG_POP -fi -# Using AC_SUBST eliminates the need to include config.h in a public .h file -AC_SUBST(pcre_have_type_traits) -AC_SUBST(pcre_have_bits_type_traits) - -# Conditional compilation -# MONOTONE: Not actually in Makefile anymore. -#AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes") -#AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes") - # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -326,25 +225,6 @@ AC_CHECK_FUNCS(bcopy memmove strerror st AC_CHECK_FUNCS(bcopy memmove strerror strtoq strtoll _strtoi64) -# Check for the availability of libz (aka zlib) - -AC_CHECK_HEADERS([zlib.h], [HAVE_ZLIB_H=1]) -AC_CHECK_LIB([z], [gzopen], [HAVE_LIBZ=1]) - -# Check for the availability of libbz2 - -AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_H=1]) -AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1]) - -# Check for the availabiity of libreadline - -AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1]) -AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1]) -AC_CHECK_LIB([readline], [readline], [HAVE_LIB_READLINE=1]) - -# This facilitates -ansi builds under Linux -dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc]) - if test "x$enable_shared" = "xno" ; then AC_DEFINE([PCRE_STATIC], [1], [ Define if linking statically (TODO: make nice with Libtool)]) @@ -478,96 +358,17 @@ fi "configure", this can be done via --enable-ebcdic.]) fi -# Platform specific issues -NO_UNDEFINED= -EXPORT_ALL_SYMBOLS= -case $host_os in - cygwin* | mingw* ) - if test X"$enable_shared" = Xyes; then - NO_UNDEFINED="-no-undefined" - EXPORT_ALL_SYMBOLS="-Wl,--export-all-symbols" - fi - ;; -esac - -# The extra LDFLAGS for each particular library -# (Note: The libpcre*_version bits are m4 variables, assigned above) - -EXTRA_LIBPCRE_LDFLAGS="$NO_UNDEFINED -version-info libpcre_version" - -EXTRA_LIBPCREPOSIX_LDFLAGS="$NO_UNDEFINED -version-info libpcreposix_version" - -EXTRA_LIBPCRECPP_LDFLAGS="$NO_UNDEFINED $EXPORT_ALL_SYMBOLS -version-info libpcrecpp_version" - -AC_SUBST(EXTRA_LIBPCRE_LDFLAGS) -AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS) -AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS) - -# When we run 'make distcheck', use these arguments. -DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -# Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is -# specified, the relevant library is available. If so, add it to LIBS. - -if test "$enable_pcregrep_libz" = "yes"; then - if test "$HAVE_ZLIB_H" != "1"; then - echo "** Cannot --enable-pcregrep-libz because zlib.h was not found" - exit 1 - fi - if test "$HAVE_LIBZ" != "1"; then - echo "** Cannot --enable-pcregrep-libz because libz was not found" - exit 1 - fi - if test "$LIBS" = ""; then LIBS=-lz; else LIBS="$LIBS -lz"; fi -fi - -if test "$enable_pcregrep_libbz2" = "yes"; then - if test "$HAVE_BZLIB_H" != "1"; then - echo "** Cannot --enable-pcregrep-libbz2 because bzlib.h was not found" - exit 1 - fi - if test "$HAVE_LIBBZ2" != "1"; then - echo "** Cannot --enable-pcregrep-libbz2 because libbz2 was not found" - exit 1 - fi - if test "$LIBS" = ""; then LIBS=-lbz2; else LIBS="$LIBS -lbz2"; fi -fi - -# Similarly for --enable-pcretest-readline - -if test "$enable_pcretest_libreadline" = "yes"; then - if test "$HAVE_READLINE_H" != "1"; then - echo "** Cannot --enable-pcretest-readline because readline/readline.h was not found." - exit 1 - fi - if test "$HAVE_HISTORY_H" != "1"; then - echo "** Cannot --enable-pcretest-readline because readline/history.h was not found." - exit 1 - fi - if test "$LIBS" = ""; then LIBS=-lreadline; else LIBS="$LIBS -lreadline"; fi -fi - # Produce these files, in addition to config.h. -# MONOTONE: C++-only generated files removed from this list. AC_CONFIG_FILES( Makefile libpcre.pc pcre-config pcre.h ) -# libpcrecpp.pc -# pcre_stringpiece.h -# pcrecpparg.h # Make the generated script files executable. AC_CONFIG_COMMANDS([script-chmod], [chmod a+x pcre-config]) -# Make sure that pcre_chartables.c is removed in case the method for -# creating it was changed by reconfiguration. -# MONOTONE: Don't! The file is never regenerated. -#AC_CONFIG_COMMANDS([delete-old-chartables], [rm -f pcre_chartables.c]) - AC_OUTPUT # Print out a nice little message after configure is run displaying your