|
Check-in Number:
|
1718 | |
| Date: |
2002-Jan-30 15:22:23 (local)
2002-Jan-30 14:22:23 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
Switch from local copy of POPT to our new linked-in child OSSP popt. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/lmtp2nntp/Makefile.in 1.43 -> 1.44
--- Makefile.in 2002/01/30 08:38:23 1.43
+++ Makefile.in 2002/01/30 14:22:23 1.44
@@ -44,11 +44,11 @@
POD2MAN = pod2man
PROG = lmtp2nntp
-HDRS = lmtp2nntp_global.h lmtp2nntp_daemon.h lmtp2nntp_lmtp.h lmtp2nntp_nntp.h lmtp2nntp_argz.h lmtp2nntp_shpat.h lmtp2nntp_msg.h lmtp2nntp_popt.h lmtp2nntp_option.h lmtp2nntp_config.h
-SRCS = lmtp2nntp_main.c lmtp2nntp_daemon.c lmtp2nntp_lmtp.c lmtp2nntp_nntp.c lmtp2nntp_argz.c lmtp2nntp_shpat.c lmtp2nntp_msg.c lmtp2nntp_popt.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_popt.o lmtp2nntp_option.o lmtp2nntp_config.o lmtp2nntp_version.o
+HDRS = lmtp2nntp_global.h lmtp2nntp_daemon.h lmtp2nntp_lmtp.h lmtp2nntp_nntp.h lmtp2nntp_argz.h lmtp2nntp_shpat.h lmtp2nntp_msg.h lmtp2nntp_option.h lmtp2nntp_config.h
+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@
+SUBDIRS = @SUBDIR_EX@ @SUBDIR_STR@ @SUBDIR_L2@ @SUBDIR_SA@ @SUBDIR_VAR@ @SUBDIR_VAL@ @SUBDIR_POPT@
all: _SUBDIRS_all lmtp2nntp lmtp2nntp.8
@@ -128,14 +128,13 @@
$(OBJS): Makefile
# AUTOMATICALLY GENERATED DEPENDENCY LIST - DO NOT EDIT
-lmtp2nntp_main.o: lmtp2nntp_main.c lmtp2nntp_argz.h lmtp2nntp_shpat.h lmtp2nntp_daemon.h lmtp2nntp_popt.h lmtp2nntp_global.h config.h lmtp2nntp_option.h lmtp2nntp_config.h fixme.h lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_lmtp.h lmtp2nntp_version.c
+lmtp2nntp_main.o: lmtp2nntp_main.c lmtp2nntp_argz.h lmtp2nntp_shpat.h lmtp2nntp_daemon.h lmtp2nntp_global.h config.h lmtp2nntp_option.h lmtp2nntp_config.h fixme.h lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_lmtp.h lmtp2nntp_version.c
lmtp2nntp_daemon.o: lmtp2nntp_daemon.c config.h lmtp2nntp_daemon.h
lmtp2nntp_lmtp.o: lmtp2nntp_lmtp.c lmtp2nntp_lmtp.h config.h
lmtp2nntp_nntp.o: lmtp2nntp_nntp.c lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_global.h config.h fixme.h
lmtp2nntp_argz.o: lmtp2nntp_argz.c lmtp2nntp_argz.h config.h
lmtp2nntp_shpat.o: lmtp2nntp_shpat.c config.h lmtp2nntp_shpat.h
lmtp2nntp_msg.o: lmtp2nntp_msg.c lmtp2nntp_msg.h lmtp2nntp_global.h config.h lmtp2nntp_argz.h
-lmtp2nntp_popt.o: lmtp2nntp_popt.c config.h lmtp2nntp_popt.h
-lmtp2nntp_option.o: lmtp2nntp_option.c lmtp2nntp_argz.h lmtp2nntp_popt.h lmtp2nntp_global.h config.h lmtp2nntp_option.h lmtp2nntp_config.h fixme.h lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_lmtp.h lmtp2nntp_version.c
-lmtp2nntp_config.o: lmtp2nntp_config.c lmtp2nntp_argz.h lmtp2nntp_popt.h lmtp2nntp_global.h config.h lmtp2nntp_option.h lmtp2nntp_config.h fixme.h lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_lmtp.h lmtp2nntp_version.c
+lmtp2nntp_option.o: lmtp2nntp_option.c lmtp2nntp_argz.h lmtp2nntp_global.h config.h lmtp2nntp_option.h lmtp2nntp_config.h fixme.h lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_lmtp.h lmtp2nntp_version.c
+lmtp2nntp_config.o: lmtp2nntp_config.c lmtp2nntp_argz.h lmtp2nntp_global.h config.h lmtp2nntp_option.h lmtp2nntp_config.h fixme.h lmtp2nntp_nntp.h lmtp2nntp_msg.h lmtp2nntp_lmtp.h lmtp2nntp_version.c
lmtp2nntp_version.o: lmtp2nntp_version.c lmtp2nntp_version.c
|
|
ossp-pkg/lmtp2nntp/configure.ac 1.22 -> 1.23
--- configure.ac 2002/01/30 08:38:23 1.22
+++ configure.ac 2002/01/30 14:22:23 1.23
@@ -117,6 +117,17 @@
LIBS_EXTRA="$LIBS_EXTRA -lval"])
AC_SUBST(SUBDIR_VAL)
+dnl # check for OSSP popt library
+AC_CHECK_EXTLIB([OSSP popt],
+ popt, popt_getcontext, popt.h,
+ [SUBDIR_POPT=""],
+ [SUBDIR_POPT="lib_popt"
+ CPPFLAGS="$CPPFLAGS -Ilib_popt"
+ CFLAGS="$CFLAGS -Ilib_popt"
+ LDFLAGS="$LDFLAGS -Llib_popt/.libs"
+ LIBS_EXTRA="$LIBS_EXTRA -lpopt"])
+AC_SUBST(SUBDIR_POPT)
+
dnl # check for external Dmalloc library
AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h, AC_DEFINE(DMALLOC))
@@ -127,7 +138,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])
+AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_L2 $SUBDIR_SA $SUBDIR_VAR $SUBDIR_VAL $SUBDIR_POPT])
dnl # standard output generation
AC_CONFIG_HEADERS(config.h)
|
|
ossp-pkg/lmtp2nntp/devtool.conf 1.3 -> 1.4
--- devtool.conf 2002/01/30 08:38:23 1.3
+++ devtool.conf 2002/01/30 14:22:23 1.4
@@ -24,6 +24,9 @@
echo "===> lib_val (devtool autogen)"
(cd lib_val && ./devtool autogen)
echo "<=== lib_val"
+ echo "===> lib_popt (devtool autogen)"
+ (cd lib_popt && ./devtool autogen)
+ echo "<=== lib_popt"
%autoclean
@autoclean shtool
@@ -47,9 +50,13 @@
echo "===> lib_val (devtool autoclean)"
(cd lib_val && ./devtool autoclean)
echo "<=== lib_val"
+ echo "===> lib_popt (devtool autoclean)"
+ (cd lib_popt && ./devtool autoclean)
+ echo "<=== lib_popt"
%configure
./configure \
+ --cache-file=config.cache \
--prefix=/tmp/lmtp2nntp \
--disable-shared \
--enable-maintainer \
|
|
ossp-pkg/lmtp2nntp/lmtp2nntp_config.c 1.16 -> 1.17
--- lmtp2nntp_config.c 2002/01/24 16:25:54 1.16
+++ lmtp2nntp_config.c 2002/01/30 14:22:23 1.17
@@ -31,11 +31,11 @@
/* third party (included) */
#include "lmtp2nntp_argz.h"
-#include "lmtp2nntp_popt.h"
/* third party (linked in) */
-#include <str.h>
-#include <val.h>
+#include "str.h"
+#include "val.h"
+#include "popt.h"
/* library version check (compile-time) */
#define STR_VERSION_HEX_REQ 0x009206
|
|
ossp-pkg/lmtp2nntp/lmtp2nntp_main.c 1.10 -> 1.11
--- lmtp2nntp_main.c 2002/01/30 08:38:23 1.10
+++ lmtp2nntp_main.c 2002/01/30 14:22:23 1.11
@@ -42,7 +42,6 @@
#include "lmtp2nntp_argz.h"
#include "lmtp2nntp_shpat.h"
#include "lmtp2nntp_daemon.h"
-#include "lmtp2nntp_popt.h"
/* third party (linked in) */
#include "ex.h"
@@ -51,6 +50,7 @@
#include "sa.h"
#include "var.h"
#include "val.h"
+#include "popt.h"
/* library version check (compile-time) */
#define L2_VERSION_HEX_REQ 0x001200
|
|
ossp-pkg/lmtp2nntp/lmtp2nntp_option.c 1.2 -> 1.3
--- lmtp2nntp_option.c 2002/01/24 16:25:54 1.2
+++ lmtp2nntp_option.c 2002/01/30 14:22:23 1.3
@@ -30,11 +30,11 @@
/* third party (included) */
#include "lmtp2nntp_argz.h"
-#include "lmtp2nntp_popt.h"
/* third party (linked in) */
-#include <str.h>
-#include <val.h>
+#include "str.h"
+#include "val.h"
+#include "popt.h"
/* library version check (compile-time) */
#define STR_VERSION_HEX_REQ 0x009206
|
|
ossp-pkg/lmtp2nntp/lmtp2nntp_popt.c 1.1 -> 1.2
ossp-pkg/lmtp2nntp/lmtp2nntp_popt.h 1.1 -> 1.2
