OSSP CVS Repository

ossp - Difference in ossp-pkg/rc/configure.in versions 1.5 and 1.6
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

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)

CVSTrac 2.0.1