Index: ossp-pkg/rc/00TODO RCS File: /v/ossp/cvs/ossp-pkg/rc/00TODO,v rcsdiff -q -kk '-r1.19' '-r1.20' -u '/v/ossp/cvs/ossp-pkg/rc/00TODO,v' 2>/dev/null --- 00TODO 2002/02/07 15:36:26 1.19 +++ 00TODO 2002/02/08 18:35:03 1.20 @@ -14,6 +14,7 @@ Refs, pri, user, group, ci, go only in normal (not special) sections. Consider + Nice to have feature for ex, a pEx->pObj->strErr(pEx->Value); Removing the OSSP_RC_DEACT deactivation feature (thl.) Offer include directive in config file. Dynamic handling of command interpreter option. Index: ossp-pkg/rc/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/rc/Makefile.in,v rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/rc/Makefile.in,v' 2>/dev/null --- Makefile.in 2002/02/07 15:37:09 1.12 +++ Makefile.in 2002/02/08 18:35:03 1.13 @@ -58,10 +58,13 @@ TARGET_PROGS = rc TARGET_MANS = rc.1 rc-sample.5 -SRCS = rc.c rc_option.c rc_version.c rc_pcre.c -OBJS = rc.o rc_option.o rc_version.o rc_pcre.o +SRCS = rc.c rc_config.c rc_option.c rc_version.c\ + rc_pcre.c rc_util.c -SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_STR@ @SUBDIR_POPT@ +OBJS = rc.o rc_config.o rc_option.o rc_version.o\ + rc_pcre.o rc_util.o + +SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_VAL@ @SUBDIR_STR@ @SUBDIR_POPT@ .SUFFIXES: .SUFFIXES: .c .cc .cpp .o @@ -134,10 +137,10 @@ distclean: clean $(RM) config.log config.status config.cache # Generated by ./configure - $(RM) Makefile rc_config.h # Generated by ./configure + $(RM) Makefile ac_config.h # Generated by ./configure realclean: distclean - $(RM) configure rc_config.h.in # Generated by Autoconf + $(RM) configure ac_config.h.in # Generated by Autoconf $(RM) shtool check: test Index: ossp-pkg/rc/configure.in RCS File: /v/ossp/cvs/ossp-pkg/rc/configure.in,v rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/rc/configure.in,v' 2>/dev/null --- configure.in 2002/02/07 15:37:09 1.12 +++ configure.in 2002/02/08 18:35:03 1.13 @@ -42,7 +42,7 @@ dnl Process this file with autoconf AC_INIT(rc.h) -AC_CONFIG_HEADER(rc_config.h) +AC_CONFIG_HEADER(ac_config.h) AC_LANG_C dnl Checks basic requirements @@ -114,6 +114,17 @@ LIBS_EXTRA="$LIBS_EXTRA -lvar"]) AC_SUBST(SUBDIR_VAR) +dnl Check for OSSP val library +AC_CHECK_EXTLIB([OSSP Val], + val, val_expand, val.h, + [SUBDIR_VAL=""], + [SUBDIR_VAL="rc_val" + CPPFLAGS="$CPPFLAGS -Irc_val" + CFLAGS="$CFLAGS -Irc_val" + LDFLAGS="$LDFLAGS -Lrc_val/.libs" + LIBS_EXTRA="$LIBS_EXTRA -lval"]) +AC_SUBST(SUBDIR_VAL) + dnl Extra library handling LIBS="$LIBS $LIBS_EXTRA" @@ -122,7 +133,7 @@ enable_headline=no export enable_headline dnl Call other configure scripts -AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_VAR $SUBDIR_POPT]) +AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_VAR $SUBDIR_VAL $SUBDIR_POPT]) dnl Make all the necessary Makefiles #AC_CONFIG_FILES(Makefile) Index: ossp-pkg/rc/devtool.conf RCS File: /v/ossp/cvs/ossp-pkg/rc/devtool.conf,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/rc/devtool.conf,v' 2>/dev/null --- devtool.conf 2002/02/05 19:11:45 1.8 +++ devtool.conf 2002/02/08 18:35:03 1.9 @@ -18,6 +18,9 @@ echo "===> rc_var (devtool autogen)" (cd rc_var && ./devtool autogen) echo "<=== rc_var" + echo "===> rc_val (devtool autogen)" + (cd rc_val && ./devtool autogen) + echo "<=== rc_val" %autoclean @autoclean shtool @@ -32,6 +35,9 @@ echo "===> rc_var (devtool autoclean)" (cd rc_var && ./devtool autoclean) echo "<=== rc_var" + echo "===> rc_val (devtool autoclean)" + (cd rc_val && ./devtool autoclean) + echo "<=== rc_val" %configure ./configure \ Index: ossp-pkg/rc/devtool.func RCS File: /v/ossp/cvs/ossp-pkg/rc/devtool.func,v rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/rc/devtool.func,v' 2>/dev/null --- devtool.func 2002/02/04 21:46:00 1.4 +++ devtool.func 2002/02/08 18:35:03 1.5 @@ -30,7 +30,7 @@ case $tool in autoconf ) autoconf_version=`devtool_require autoconf --version 4 "$1" "$2"` - echo "generating (GNU Autoconf $autoconf_version): configure rc_config.h.in" + echo "generating (GNU Autoconf $autoconf_version): configure ac_config.h.in" autoconf autoheader 2>&1 | grep -v "is unchanged" ;; @@ -56,8 +56,8 @@ shift case $tool in autoconf ) - echo "removing: configure rc_config.h.in" - rm -f configure rc_config.h.in + echo "removing: configure ac_config.h.in" + rm -f configure ac_config.h.in ;; libtool ) echo "removing: ltmain.sh libtool.m4 config.guess config.sub"