|
Check-in Number:
|
1791 | |
| Date: |
2002-Feb-04 22:46:00 (local)
2002-Feb-04 21:46:00 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Changed to rc_config.h.in and some other build configuration corrections.
PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from: |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/Makefile.in 1.2 -> 1.3
--- Makefile.in 2002/01/30 17:29:15 1.2
+++ Makefile.in 2002/02/04 21:46:00 1.3
@@ -87,11 +87,11 @@
distclean: clean
-$(RM) config.log config.status config.cache
- -$(RM) Makefile config.h
+ -$(RM) Makefile rc_config.h
-$(RM) libtool
realclean: distclean
- -$(RM) configure config.h.in
+ -$(RM) configure rc_config.h.in
-$(RM) shtool
-$(RM) ltmain.sh libtool.m4 config.guess config.sub
|
|
ossp-pkg/rc/configure.in 1.5 -> 1.6
--- configure.in 2002/01/30 17:29:15 1.5
+++ configure.in 2002/02/04 21:46:00 1.6
@@ -42,7 +42,7 @@
dnl Process this file with autoconf
AC_INIT(rc.h)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(rc_config.h)
AC_LANG_C
dnl Checks basic requirements
@@ -68,14 +68,25 @@
dmalloc, dmalloc_debug, dmalloc.h,
AC_DEFINE(DMALLOC))
+dnl Check for OSSP popt library
+AC_CHECK_EXTLIB([OSSP popt],
+ popt, popt_getcontext, popt.h,
+ [SUBDIR_POPT=""],
+ [SUBDIR_POPT="rc_popt"
+ CPPFLAGS="$CPPFLAGS -Irc_popt"
+ CFLAGS="$CFLAGS -Irc_popt"
+ LDFLAGS="$LDFLAGS -Lrc_popt/.libs"
+ LIBS_EXTRA="$LIBS_EXTRA -lpopt"])
+AC_SUBST(SUBDIR_EX)
+
dnl Check for OSSP ex library
AC_CHECK_EXTLIB([OSSP ex],
ex, __ex_ctx, ex.h,
[SUBDIR_EX=""],
- [SUBDIR_EX="lib_ex"
- CPPFLAGS="$CPPFLAGS -Ilib_ex"
- CFLAGS="$CFLAGS -Ilib_ex"
- LDFLAGS="$LDFLAGS -Llib_ex/.libs"
+ [SUBDIR_EX="rc_ex"
+ CPPFLAGS="$CPPFLAGS -Irc_ex"
+ CFLAGS="$CFLAGS -Irc_ex"
+ LDFLAGS="$LDFLAGS -Lrc_ex/.libs"
LIBS_EXTRA="$LIBS_EXTRA -lex"])
AC_SUBST(SUBDIR_EX)
@@ -105,7 +116,7 @@
LIBS="$LIBS $LIBS_EXTRA"
dnl Call other configure scripts
-AC_CONFIG_SUBDIRS([@SUBDIR_EX@ $SUBDIR_STR $SUBDIR_VAR])
+AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_VAR $SUBDIR_POPT])
dnl Make all the necessary Makefiles
#AC_CONFIG_FILES(Makefile)
|
|
ossp-pkg/rc/devtool.func 1.3 -> 1.4
--- devtool.func 2002/01/23 16:51:54 1.3
+++ devtool.func 2002/02/04 21:46:00 1.4
@@ -30,7 +30,7 @@
case $tool in
autoconf )
autoconf_version=`devtool_require autoconf --version 4 "$1" "$2"`
- echo "generating (GNU Autoconf $autoconf_version): configure config.h.in"
+ echo "generating (GNU Autoconf $autoconf_version): configure rc_config.h.in"
autoconf
autoheader 2>&1 | grep -v "is unchanged"
;;
@@ -56,8 +56,8 @@
shift
case $tool in
autoconf )
- echo "removing: configure config.h.in"
- rm -f configure config.h.in
+ echo "removing: configure rc_config.h.in"
+ rm -f configure rc_config.h.in
;;
libtool )
echo "removing: ltmain.sh libtool.m4 config.guess config.sub"
|
|
ossp-pkg/rc/rc_pcre.c 1.1 -> 1.2
--- rc_pcre.c 2002/01/28 20:58:37 1.1
+++ rc_pcre.c 2002/02/04 21:46:00 1.2
@@ -42,7 +42,7 @@
----------------------------------------------------------------------------- */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "rc_config.h"
#endif
#include <ctype.h>
|
|
