|
Check-in Number:
|
4871 | |
| Date: |
2004-Nov-27 20:56:24 (local)
2004-Nov-27 19:56:24 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
add Autoconf support for new Perl API |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/cfg/Makefile.in 1.6 -> 1.7
--- Makefile.in 2004/07/17 07:37:55 1.6
+++ Makefile.in 2004/11/27 19:56:24 1.7
@@ -53,6 +53,7 @@
POD2MAN = pod2man
FLEX = @FLEX@
BISON = @BISON@
+PERL = @PERL@
# build objects
LIB_NAME = libcfg.la
@@ -61,12 +62,17 @@
TST_NAME = cfg_test
TST_OBJS = cfg_test.o
+PERL_NAME = perl/blib/lib/OSSP/cfg.pm
+PERL_OBJS = perl/cfg.pm
+
+WITH_PERL = @WITH_PERL@
+
# recognized suffixes for implicit rules
.SUFFIXES:
.SUFFIXES: .c .o .lo
# default target
-all: $(LIB_NAME) $(TST_NAME)
+all: $(LIB_NAME) $(TST_NAME) @PERL_NAME@
# implicit rules for compilation
.c.o:
@@ -83,6 +89,10 @@
$(TST_NAME): $(TST_OBJS) $(LIB_NAME)
$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -o $(TST_NAME) $(TST_OBJS) $(LIB_NAME) $(LIBS)
+# explicit rule for Perl API
+$(PERL_NAME): $(PERL_OBJS) $(LIB_NAME)
+ @cd perl && $(PERL) Makefile.PL PREFIX=$(prefix) && $(MAKE) $(MFLAGS) all
+
# explicit rules for compiler construction tools
cfg_syn.c: cfg_syn.h cfg_syn_parse.h
cfg_syn_scan.o: cfg_syn_scan.c cfg_syn_parse.h
@@ -112,6 +122,9 @@
$(SHTOOL) echo -e "%BATTENTION: Parsing Difference (cfg_test.cfg vs. cfg_test.out):%b"; \
diff -u3 cfg_test.out cfg_test.try; \
fi
+ -@if [ ".$(WITH_PERL)" = .yes ]; then \
+ (cd perl && $(MAKE) $(MFLAGS) test); \
+ fi
check-setup:
@./$(TST_NAME) cfg_test.cfg >cfg_test.out
@@ -126,6 +139,9 @@
$(SHTOOL) install -c -m 644 cfg.h $(DESTDIR)$(includedir)/
$(SHTOOL) install -c -m 644 cfg.3 $(DESTDIR)$(mandir)/man3/
$(LIBTOOL) --quiet --mode=install $(SHTOOL) install -c -m 644 libcfg.la $(DESTDIR)$(libdir)/
+ -@if [ ".$(WITH_PERL)" = .yes ]; then \
+ (cd perl && $(MAKE) $(MFLAGS) install); \
+ fi
# perform uninstallation procedure
uninstall:
@@ -147,12 +163,18 @@
-$(RM) cfg_test.try
-$(RM) -r .libs >/dev/null 2>&1 || $(TRUE)
-$(RM) *.o *.lo
+ -@if [ ".$(WITH_PERL)" = .yes ]; then \
+ (cd perl && $(MAKE) $(MFLAGS) clean); \
+ fi
# perform distribution clean up procedure
distclean: clean
-$(RM) config.log config.status config.cache
-$(RM) Makefile config.h cfg-config
-$(RM) libtool
+ -@if [ ".$(WITH_PERL)" = .yes ]; then \
+ (cd perl && $(MAKE) $(MFLAGS) distclean || true; rm -f Makefile.old); \
+ fi
# perform developer clean up procedure
realclean: distclean
|
|
ossp-pkg/cfg/README 1.11 -> 1.12
--- README 2004/11/20 11:52:41 1.11
+++ README 2004/11/27 19:56:24 1.12
@@ -5,7 +5,7 @@
|_|_|_| \___/|____/____/|_| \___|_| \__, |
|___/
OSSP cfg - Configuration Parsing
- Version 0.9.5 (20-Nov-2004)
+ Version 0.9.5 (27-Nov-2004)
ABSTRACT
|
|
ossp-pkg/cfg/cfg.ac 1.3 -> 1.4
--- cfg.ac 2004/07/17 07:37:55 1.3
+++ cfg.ac 2004/11/27 19:56:24 1.4
@@ -29,11 +29,29 @@
dnl ##
-dnl # Check for anything OSSP SA wants to know
+dnl # Check for anything OSSP cfg wants to know
dnl # configure.in:
dnl # CFG_CHECK_ALL
AC_DEFUN(CFG_CHECK_ALL,[
- :
+ dnl # configure option --with-perl
+ AC_ARG_WITH([perl],
+ AS_HELP_STRING([--with-perl], [build Perl bindings to C API]),
+ [ac_cv_with_perl=$withval], [ac_cv_with_perl=no])
+ AC_CACHE_CHECK([whether to build Perl bindings to C API], [ac_cv_with_perl], [ac_cv_with_perl=no])
+ if test ".$ac_cv_with_perl" = ".yes"; then
+ AC_DEFINE(WITH_PERL, 1, [whether to build Perl bindings to C API])
+ WITH_PERL='yes'
+ PERL_NAME='$(PERL_NAME)'
+ else
+ WITH_PERL='no'
+ PERL_NAME=''
+ fi
+ AC_SUBST(WITH_PERL)
+ AC_SUBST(PERL_NAME)
+ AC_PATH_PROG(PERL, perl, NA)
+ if test ".$ac_cv_with_perl" = ".yes" -a ".$PERL" = ".NA"; then
+ AC_ERROR([required Perl interpreter not found in \$PATH])
+ fi
])
|
|
ossp-pkg/cfg/cfg_vers.c 1.9 -> 1.10
--- cfg_vers.c 2004/11/20 11:52:41 1.9
+++ cfg_vers.c 2004/11/27 19:56:24 1.10
@@ -34,12 +34,12 @@
__cfg_version_t __cfg_version = {
0x009205,
"0.9.5",
- "0.9.5 (20-Nov-2004)",
- "This is OSSP cfg, Version 0.9.5 (20-Nov-2004)",
- "OSSP cfg 0.9.5 (20-Nov-2004)",
+ "0.9.5 (27-Nov-2004)",
+ "This is OSSP cfg, Version 0.9.5 (27-Nov-2004)",
+ "OSSP cfg 0.9.5 (27-Nov-2004)",
"OSSP cfg/0.9.5",
- "@(#)OSSP cfg 0.9.5 (20-Nov-2004)",
- "$Id: cfg_vers.c,v 1.9 2004/11/20 11:52:41 rse Exp $"
+ "@(#)OSSP cfg 0.9.5 (27-Nov-2004)",
+ "$Id: cfg_vers.c,v 1.10 2004/11/27 19:56:24 rse Exp $"
};
#endif /* _CFG_VERS_C_AS_HEADER_ */
|
|
ossp-pkg/cfg/devtool.conf 1.18 -> 1.19
--- devtool.conf 2004/10/31 19:12:50 1.18
+++ devtool.conf 2004/11/27 19:56:24 1.19
@@ -44,6 +44,7 @@
--disable-shared \
--enable-maintainer \
--enable-debug \
+ --with-perl
"$@"
%release
@@ -56,6 +57,9 @@
./shtool version -lc -n "OSSP cfg" -p "__cfg_" -e cfg_vers.c
V=`./shtool version -lc -dlong cfg_vers.c`
sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
+ V=`./shtool version -l c -d short cfg_vers.c`
+ sed -e "s/\(v = ('\)[^']*\('\)/\1$V\2/g" <perl/cfg.pm >perl/cfg.pm.n
+ mv perl/cfg.pm.n perl/cfg.pm
%tag
V=`./shtool version -lc -dshort cfg_vers.c | sed -e 's;\.;_;g'`
|
|
ossp-pkg/cfg/perl/cfg.pm 1.8 -> 1.9
--- cfg.pm 2004/11/27 19:40:33 1.8
+++ cfg.pm 2004/11/27 19:56:25 1.9
@@ -42,7 +42,7 @@
##
# API version
-our $VERSION = do { my @v = ('1.1.0' =~ m/\d+/g); sprintf("%d.".("%02d"x$#v), @v); };
+our $VERSION = do { my @v = ('0.9.5' =~ m/\d+/g); sprintf("%d.".("%02d"x$#v), @v); };
# API inheritance
our @ISA = qw(Exporter);
|
|
