|
Check-in Number:
|
2279 | |
| Date: |
2002-Jul-12 19:26:23 (local)
2002-Jul-12 17:26:23 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
add OSSP pcre to build environment |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/fsl/Makefile.in 1.1 -> 1.2
--- Makefile.in 2002/07/09 09:42:09 1.1
+++ Makefile.in 2002/07/12 17:26:23 1.2
@@ -57,7 +57,7 @@
TST_NAME = fsl_test
TST_OBJS = fsl_test.o
-SUBDIRS = @SUBDIR_L2@ @SUBDIR_CFG@
+SUBDIRS = @SUBDIR_L2@ @SUBDIR_CFG@ @SUBDIR_PCRE@
.SUFFIXES:
.SUFFIXES: .c .o .lo
|
|
ossp-pkg/fsl/configure.ac 1.2 -> 1.3
--- configure.ac 2002/07/10 09:08:51 1.2
+++ configure.ac 2002/07/12 17:26:23 1.3
@@ -67,9 +67,19 @@
LIB_DEPS="$LIB_DEPS lib_cfg/*.lo"])
AC_SUBST(SUBDIR_CFG)
+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"
+ LIB_DEPS="$LIB_DEPS lib_pcre/*.lo"])
+AC_SUBST(SUBDIR_PCRE)
+
dnl # post-processing for subdirs
AC_SUBST(LIB_DEPS)
-AC_CONFIG_SUBDIRS([$SUBDIR_L2 $SUBDIR_CFG])
+AC_CONFIG_SUBDIRS([$SUBDIR_L2 $SUBDIR_CFG $SUBDIR_PCRE])
AC_MSG_CHECKING(for configuration directory)
AC_ARG_WITH(cfgdir,dnl
|
|
ossp-pkg/fsl/devtool.conf 1.1 -> 1.2
--- devtool.conf 2002/07/09 09:42:09 1.1
+++ devtool.conf 2002/07/12 17:26:23 1.2
@@ -3,7 +3,7 @@
##
%checkout
- for name in l2 cfg; do
+ for name in l2 cfg pcre; do
echo "===> lib_${name} (cvs co)"
cvs co -d lib_${name} ${name}
echo "<=== lib_${name}"
@@ -14,7 +14,7 @@
@autogen libtool 1.4.2 "1.4*"
@autogen autoconf 2.53 "2.5[3-9]*"
- for name in l2 cfg; do
+ for name in l2 cfg pcre; do
echo "===> lib_${name} (devtool autogen)"
(cd lib_${name} && ./devtool autogen)
echo "<=== lib_${name}"
@@ -25,7 +25,7 @@
@autoclean libtool
@autoclean autoconf
- for name in l2 cfg; do
+ for name in l2 cfg pcre; do
echo "===> lib_${name} (devtool autogen)"
(cd lib_${name} && ./devtool autoclean)
echo "<=== lib_${name}"
|
|
