pcre-link.patch

   1 --- pcre-7.7/configure.ac.orig  2008-05-07 18:22:03.000000000 +0200
   2 +++ pcre-7.7/configure.ac       2008-06-17 19:40:42.879677506 +0200
   3 @@ -533,6 +533,8 @@
   4  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)
   5  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
   6  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
   7 +AC_SUBST(PCREGREP_LIBS)
   8 +AC_SUBST(PCRETEST_LIBS)
   9
  10  # When we run 'make distcheck', use these arguments.
  11  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"
  12 @@ -550,7 +552,7 @@
  13      echo "** Cannot --enable-pcregrep-libz because libz was not found"
  14      exit 1
  15    fi
  16 -  if test "$LIBS" = ""; then LIBS=-lz; else LIBS="$LIBS -lz"; fi
  17 +  if test "$PCREGREP_LIBS" = ""; then PCREGREP_LIBS=-lz; else PCREGREP_LIBS="$PCREGREP_LIBS -lz"; fi
  18  fi
  19
  20  if test "$enable_pcregrep_libbz2" = "yes"; then
  21 @@ -562,7 +564,7 @@
  22      echo "** Cannot --enable-pcregrep-libbz2 because libbz2 was not found"
  23      exit 1
  24    fi
  25 -  if test "$LIBS" = ""; then LIBS=-lbz2; else LIBS="$LIBS -lbz2"; fi
  26 +  if test "$PCREGREP_LIBS" = ""; then PCREGREP_LIBS=-lbz2; else PCREGREP_LIBS="$PCREGREP_LIBS -lbz2"; fi
  27  fi
  28
  29  # Similarly for --enable-pcretest-readline
  30 @@ -576,7 +578,7 @@
  31      echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
  32      exit 1
  33    fi
  34 -  if test "$LIBS" = ""; then LIBS=-lreadline; else LIBS="$LIBS -lreadline"; fi
  35 +  if test "$PCRETEST_LIBS" = ""; then PCRETEST_LIBS=-lreadline; else PCRETEST_LIBS="$PCRETEST_LIBS -lreadline"; fi
  36  fi
  37
  38  # Produce these files, in addition to config.h.
  39 --- pcre-7.7/Makefile.am.orig   2008-01-23 18:58:28.000000000 +0100
  40 +++ pcre-7.7/Makefile.am        2008-06-17 19:43:11.376139837 +0200
  41 @@ -245,13 +245,13 @@
  42  EXTRA_DIST += RunTest.bat
  43  bin_PROGRAMS += pcretest
  44  pcretest_SOURCES = pcretest.c
  45 -pcretest_LDADD = libpcreposix.la
  46 +pcretest_LDADD = libpcreposix.la $(PCRETEST_LIBS)
  47
  48  TESTS += RunGrepTest
  49  dist_noinst_SCRIPTS += RunGrepTest
  50  bin_PROGRAMS += pcregrep
  51  pcregrep_SOURCES = pcregrep.c
  52 -pcregrep_LDADD = libpcreposix.la
  53 +pcregrep_LDADD = libpcreposix.la $(PCREGREP_LIBS)
  54
  55  EXTRA_DIST += \
  56    testdata/grepinput \