|
Check-in Number:
|
1843 | |
| Date: |
2002-Feb-13 14:18:25 (local)
2002-Feb-13 13:18:25 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
absorb pcre |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/lmtp2nntp/Makefile.in 1.44 -> 1.45
--- Makefile.in 2002/01/30 14:22:23 1.44
+++ Makefile.in 2002/02/13 13:18:25 1.45
@@ -48,7 +48,7 @@
SRCS = lmtp2nntp_main.c lmtp2nntp_daemon.c lmtp2nntp_lmtp.c lmtp2nntp_nntp.c lmtp2nntp_argz.c lmtp2nntp_shpat.c lmtp2nntp_msg.c lmtp2nntp_option.c lmtp2nntp_config.c lmtp2nntp_version.c
OBJS = lmtp2nntp_main.o lmtp2nntp_daemon.o lmtp2nntp_lmtp.o lmtp2nntp_nntp.o lmtp2nntp_argz.o lmtp2nntp_shpat.o lmtp2nntp_msg.o lmtp2nntp_option.o lmtp2nntp_config.o lmtp2nntp_version.o
-SUBDIRS = @SUBDIR_EX@ @SUBDIR_STR@ @SUBDIR_L2@ @SUBDIR_SA@ @SUBDIR_VAR@ @SUBDIR_VAL@ @SUBDIR_POPT@
+SUBDIRS = @SUBDIR_EX@ @SUBDIR_STR@ @SUBDIR_L2@ @SUBDIR_SA@ @SUBDIR_VAR@ @SUBDIR_VAL@ @SUBDIR_POPT@ @SUBDIR_PCRE@
all: _SUBDIRS_all lmtp2nntp lmtp2nntp.8
|
|
ossp-pkg/lmtp2nntp/configure.ac 1.23 -> 1.24
--- configure.ac 2002/01/30 14:22:23 1.23
+++ configure.ac 2002/02/13 13:18:25 1.24
@@ -128,6 +128,17 @@
LIBS_EXTRA="$LIBS_EXTRA -lpopt"])
AC_SUBST(SUBDIR_POPT)
+dnl # check for OSSP pcre library
+AC_CHECK_EXTLIB([OSSP pcre],
+ pcre, pcre_compile, pcre.h,
+ [SUBDIR_PCRE=""],
+ [SUBDIR_PCRE="lib_pcre"
+ CPPFLAGS="$CPPFLAGS -Ilib_pcre"
+ CFLAGS="$CFLAGS -Ilib_pcre"
+ LDFLAGS="$LDFLAGS -Llib_pcre/.libs"
+ LIBS_EXTRA="$LIBS_EXTRA -lpcre"])
+AC_SUBST(SUBDIR_PCRE)
+
dnl # check for external Dmalloc library
AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h, AC_DEFINE(DMALLOC))
@@ -138,7 +149,7 @@
export enable_shared
enable_headline=no
export enable_headline
-AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_L2 $SUBDIR_SA $SUBDIR_VAR $SUBDIR_VAL $SUBDIR_POPT])
+AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_L2 $SUBDIR_SA $SUBDIR_VAR $SUBDIR_VAL $SUBDIR_POPT $SUBDIR_PCRE])
dnl # standard output generation
AC_CONFIG_HEADERS(config.h)
|
|
ossp-pkg/lmtp2nntp/devtool.conf 1.4 -> 1.5
--- devtool.conf 2002/01/30 14:22:23 1.4
+++ devtool.conf 2002/02/13 13:18:25 1.5
@@ -27,6 +27,9 @@
echo "===> lib_popt (devtool autogen)"
(cd lib_popt && ./devtool autogen)
echo "<=== lib_popt"
+ echo "===> lib_pcre (devtool autogen)"
+ (cd lib_pcre && ./devtool autogen)
+ echo "<=== lib_pcre"
%autoclean
@autoclean shtool
@@ -53,6 +56,9 @@
echo "===> lib_popt (devtool autoclean)"
(cd lib_popt && ./devtool autoclean)
echo "<=== lib_popt"
+ echo "===> lib_pcre (devtool autoclean)"
+ (cd lib_pcre && ./devtool autoclean)
+ echo "<=== lib_pcre"
%configure
./configure \
|
|
