Index: ossp-pkg/lmtp2nntp/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/Makefile.in,v rcsdiff -q -kk '-r1.42' '-r1.43' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/Makefile.in,v' 2>/dev/null --- Makefile.in 2002/01/24 15:30:10 1.42 +++ Makefile.in 2002/01/30 08:38:23 1.43 @@ -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_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 -SUBDIRS = @SUBDIR_STR@ @SUBDIR_L2@ @SUBDIR_SA@ @SUBDIR_VAR@ @SUBDIR_VAL@ +SUBDIRS = @SUBDIR_EX@ @SUBDIR_STR@ @SUBDIR_L2@ @SUBDIR_SA@ @SUBDIR_VAR@ @SUBDIR_VAL@ all: _SUBDIRS_all lmtp2nntp lmtp2nntp.8 Index: ossp-pkg/lmtp2nntp/configure.ac RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/configure.ac,v rcsdiff -q -kk '-r1.21' '-r1.22' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/configure.ac,v' 2>/dev/null --- configure.ac 2002/01/17 11:53:24 1.21 +++ configure.ac 2002/01/30 08:38:23 1.22 @@ -51,8 +51,19 @@ dnl # checks for POPT library AC_CHECK_HEADERS(alloca.h float.h) -dnl # check for Str library -AC_CHECK_EXTLIB([OSSP Str], +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" + LIBS_EXTRA="$LIBS_EXTRA -lex"]) +AC_SUBST(SUBDIR_EX) + +dnl # check for OSSP str library +AC_CHECK_EXTLIB([OSSP str], str, str_parse, str.h, [SUBDIR_STR=""], [SUBDIR_STR="lib_str" @@ -62,8 +73,8 @@ LIBS_EXTRA="$LIBS_EXTRA -lstr"]) AC_SUBST(SUBDIR_STR) -dnl # check for L2 library -AC_CHECK_EXTLIB([OSSP L2], +dnl # check for OSSP l2 library +AC_CHECK_EXTLIB([OSSP l2], l2, l2_stream_log, l2.h, [SUBDIR_L2=""], [SUBDIR_L2="lib_l2" @@ -73,8 +84,8 @@ LIBS_EXTRA="$LIBS_EXTRA -ll2"]) AC_SUBST(SUBDIR_L2) -dnl # check for SA library -AC_CHECK_EXTLIB([OSSP SA], +dnl # check for OSSP sa library +AC_CHECK_EXTLIB([OSSP sa], sa, sa_create, sa.h, [SUBDIR_SA=""], [SUBDIR_SA="lib_sa" @@ -84,8 +95,8 @@ LIBS_EXTRA="$LIBS_EXTRA -lsa"]) AC_SUBST(SUBDIR_SA) -dnl # check for VAR library -AC_CHECK_EXTLIB([OSSP Var], +dnl # check for OSSP var library +AC_CHECK_EXTLIB([OSSP var], var, var_expand, var.h, [SUBDIR_VAR=""], [SUBDIR_VAR="lib_var" @@ -95,8 +106,8 @@ LIBS_EXTRA="$LIBS_EXTRA -lvar"]) AC_SUBST(SUBDIR_VAR) -dnl # check for VAL library -AC_CHECK_EXTLIB([OSSP Val], +dnl # check for OSSP val library +AC_CHECK_EXTLIB([OSSP val], val, val_create, val.h, [SUBDIR_VAL=""], [SUBDIR_VAL="lib_val" @@ -116,7 +127,7 @@ export enable_shared enable_headline=no export enable_headline -AC_CONFIG_SUBDIRS([$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]) dnl # standard output generation AC_CONFIG_HEADERS(config.h) Index: ossp-pkg/lmtp2nntp/devtool.conf RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/devtool.conf,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/devtool.conf,v' 2>/dev/null --- devtool.conf 2002/01/17 11:53:24 1.2 +++ devtool.conf 2002/01/30 08:38:23 1.3 @@ -6,6 +6,9 @@ @autogen shtool 1.5.4 "1.5.*" all @autogen autoconf 2.52 "2.5.*" + echo "===> lib_ex (devtool autogen)" + (cd lib_ex && ./devtool autogen) + echo "<=== lib_ex" echo "===> lib_str (devtool autogen)" (cd lib_str && ./devtool autogen) echo "<=== lib_str" @@ -26,6 +29,9 @@ @autoclean shtool @autoclean autoconf + echo "===> lib_ex (devtool autoclean)" + (cd lib_ex && ./devtool autoclean) + echo "<=== lib_ex" echo "===> lib_str (devtool autoclean)" (cd lib_str && ./devtool autoclean) echo "<=== lib_str" Index: ossp-pkg/lmtp2nntp/lmtp2nntp_main.c RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v' 2>/dev/null --- lmtp2nntp_main.c 2002/01/24 16:25:54 1.9 +++ lmtp2nntp_main.c 2002/01/30 08:38:23 1.10 @@ -45,9 +45,12 @@ #include "lmtp2nntp_popt.h" /* third party (linked in) */ +#include "ex.h" #include "str.h" #include "l2.h" +#include "sa.h" #include "var.h" +#include "val.h" /* library version check (compile-time) */ #define L2_VERSION_HEX_REQ 0x001200