diff -ubr dotconf-1.0.12/ChangeLog dotconf-1.0.13/ChangeLog --- dotconf-1.0.12/ChangeLog Sat Feb 22 15:55:02 2003 +++ dotconf-1.0.13/ChangeLog Thu Jun 26 09:50:20 2003 @@ -1,3 +1,7 @@ +[2003 06 25] [v1.0.13] + - James Cassidy sent in a little patch to add a 'pkg-config' file + - Bastian Kleineidam sent in a patch for better support of 64bit architectures + [2003 02 22] [v1.0.12] - Joost Remijn of eidetica.com sent in a patch fixing a nasty realloc() bug diff -ubr dotconf-1.0.12/Makefile.am dotconf-1.0.13/Makefile.am --- dotconf-1.0.12/Makefile.am Wed Jan 30 15:59:17 2002 +++ dotconf-1.0.13/Makefile.am Thu Jun 26 10:08:16 2003 @@ -6,7 +6,11 @@ m4datadir = $(datadir)/aclocal m4data_DATA = dotconf.m4 -EXTRA_DIST = bootstrap.sh $(m4data_DATA) dotconf_all.dsw dotconf_all.dsp dotconf.spec +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dotconf.pc + +EXTRA_DIST = bootstrap.sh $(m4data_DATA) $(pkgconfig_DATA).in dotconf_all.dsw \ + dotconf_all.dsp dotconf.spec dist-hook: cp -r $(top_srcdir)/examples $(top_distdir)/ diff -ubr dotconf-1.0.12/Makefile.in dotconf-1.0.13/Makefile.in --- dotconf-1.0.12/Makefile.in Sat Feb 22 15:55:06 2003 +++ dotconf-1.0.13/Makefile.in Thu Jun 26 10:08:22 2003 @@ -92,20 +92,24 @@ m4datadir = $(datadir)/aclocal m4data_DATA = dotconf.m4 -EXTRA_DIST = bootstrap.sh $(m4data_DATA) dotconf_all.dsw dotconf_all.dsp dotconf.spec +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dotconf.pc + +EXTRA_DIST = bootstrap.sh $(m4data_DATA) $(pkgconfig_DATA).in dotconf_all.dsw dotconf_all.dsp dotconf.spec + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = dotconf-config dotconf.spec +CONFIG_CLEAN_FILES = dotconf-config dotconf.spec dotconf.pc SCRIPTS = $(bin_SCRIPTS) -DATA = $(m4data_DATA) +DATA = $(m4data_DATA) $(pkgconfig_DATA) DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS acconfig.h acinclude.m4 aclocal.m4 \ config.guess config.h.in config.sub configure configure.in \ -dotconf-config.in dotconf.spec.in install-sh ltmain.sh missing \ -mkinstalldirs +dotconf-config.in dotconf.pc.in dotconf.spec.in install-sh ltmain.sh \ +missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -160,6 +164,8 @@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status dotconf.spec: $(top_builddir)/config.status dotconf.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +dotconf.pc: $(top_builddir)/config.status dotconf.pc.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @@ -199,6 +205,25 @@ rm -f $(DESTDIR)$(m4datadir)/$$p; \ done +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ + fi; fi; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + list='$(pkgconfig_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ + done + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -361,13 +386,14 @@ install-exec-am: install-binSCRIPTS install-exec: install-exec-recursive -install-data-am: install-m4dataDATA +install-data-am: install-m4dataDATA install-pkgconfigDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA +uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA \ + uninstall-pkgconfigDATA uninstall: uninstall-recursive all-am: Makefile $(SCRIPTS) $(DATA) config.h all-redirect: all-recursive-am @@ -375,7 +401,8 @@ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \ + $(DESTDIR)$(pkgconfigdir) mostlyclean-generic: @@ -411,11 +438,11 @@ .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \ -install-m4dataDATA install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +install-m4dataDATA uninstall-pkgconfigDATA install-pkgconfigDATA \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ diff -ubr dotconf-1.0.12/configure dotconf-1.0.13/configure --- dotconf-1.0.12/configure Sat Feb 22 14:12:41 2003 +++ dotconf-1.0.13/configure Thu Jun 26 09:50:47 2003 @@ -706,9 +706,9 @@ # DOTCONF_MAJOR_VERSION=1 DOTCONF_MINOR_VERSION=0 -DOTCONF_MICRO_VERSION=13 -DOTCONF_INTERFACE_AGE=3 -DOTCONF_BINARY_AGE=13 +DOTCONF_MICRO_VERSION=14 +DOTCONF_INTERFACE_AGE=4 +DOTCONF_BINARY_AGE=14 DOTCONF_VERSION=$DOTCONF_MAJOR_VERSION.$DOTCONF_MINOR_VERSION.$DOTCONF_MICRO_VERSION @@ -898,7 +898,7 @@ PACKAGE=dotconf -VERSION=1.0.12 +VERSION=1.0.13 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -5448,6 +5448,7 @@ doc/Makefile dotconf-config dotconf.spec +dotconf.pc config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff -ubr dotconf-1.0.12/configure.in dotconf-1.0.13/configure.in --- dotconf-1.0.12/configure.in Sat Feb 22 13:34:38 2003 +++ dotconf-1.0.13/configure.in Thu Jun 26 09:41:54 2003 @@ -10,9 +10,9 @@ # DOTCONF_MAJOR_VERSION=1 DOTCONF_MINOR_VERSION=0 -DOTCONF_MICRO_VERSION=13 -DOTCONF_INTERFACE_AGE=3 -DOTCONF_BINARY_AGE=13 +DOTCONF_MICRO_VERSION=14 +DOTCONF_INTERFACE_AGE=4 +DOTCONF_BINARY_AGE=14 DOTCONF_VERSION=$DOTCONF_MAJOR_VERSION.$DOTCONF_MINOR_VERSION.$DOTCONF_MICRO_VERSION AC_SUBST(DOTCONF_MAJOR_VERSION) @@ -32,7 +32,7 @@ AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -AM_INIT_AUTOMAKE(dotconf, 1.0.12) +AM_INIT_AUTOMAKE(dotconf, 1.0.13) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -54,6 +54,7 @@ doc/Makefile dotconf-config dotconf.spec +dotconf.pc ]) echo Only in dotconf-1.0.13: dotconf.pc.in diff -ubr dotconf-1.0.12/dotconf.spec dotconf-1.0.13/dotconf.spec --- dotconf-1.0.12/dotconf.spec Sat Feb 22 14:58:31 2003 +++ dotconf-1.0.13/dotconf.spec Thu Jun 26 10:07:06 2003 @@ -1,6 +1,6 @@ Summary: dot.conf Name: dotconf -Version: 1.0.12 +Version: 1.0.13 Release: 1 Copyright: LGPL Group: Development/Libraries Only in dotconf-1.0.13/examples/caseinsensitive: output Only in dotconf-1.0.13/examples/caseinsensitive: testoutput Only in dotconf-1.0.13/examples/context: output Only in dotconf-1.0.13/examples/context: testoutput diff -ubr dotconf-1.0.12/examples/duplicates/Makefile dotconf-1.0.13/examples/duplicates/Makefile --- dotconf-1.0.12/examples/duplicates/Makefile Sat Feb 22 15:55:10 2003 +++ dotconf-1.0.13/examples/duplicates/Makefile Thu Jun 26 10:08:26 2003 @@ -19,3 +19,4 @@ clean: rm -f *.so *.o duplicate + Only in dotconf-1.0.13/examples/duplicates: output Only in dotconf-1.0.13/examples/duplicates: testoutput Only in dotconf-1.0.13/examples/errorhandler: output Only in dotconf-1.0.13/examples/errorhandler: testoutput Only in dotconf-1.0.13/examples/fallback: output Only in dotconf-1.0.13/examples/fallback: testoutput Only in dotconf-1.0.13/examples: maketest.sh Only in dotconf-1.0.13/examples/modules: output Only in dotconf-1.0.13/examples/modules: testoutput Only in dotconf-1.0.13/examples/noinline: noinline.c Only in dotconf-1.0.13/examples/noinline: output Only in dotconf-1.0.13/examples/noinline: testoutput Only in dotconf-1.0.13/examples/simple: output Only in dotconf-1.0.13/examples/simple: testoutput diff -ubr dotconf-1.0.12/libpool/Makefile.in dotconf-1.0.13/libpool/Makefile.in --- dotconf-1.0.12/libpool/Makefile.in Sat Feb 22 15:55:07 2003 +++ dotconf-1.0.13/libpool/Makefile.in Thu Jun 26 10:08:23 2003 @@ -273,6 +273,7 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +pool.o: pool.c libpool.h info-am: info: info-am diff -ubr dotconf-1.0.12/src/Makefile.in dotconf-1.0.13/src/Makefile.in --- dotconf-1.0.12/src/Makefile.in Sat Feb 22 15:55:08 2003 +++ dotconf-1.0.13/src/Makefile.in Thu Jun 26 10:08:24 2003 @@ -266,6 +266,8 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +dotconf.lo dotconf.o : dotconf.c dotconf.h +readdir.lo readdir.o : readdir.c info-am: info: info-am diff -ubr dotconf-1.0.12/src/dotconf.c dotconf-1.0.13/src/dotconf.c --- dotconf-1.0.12/src/dotconf.c Sat Feb 22 13:15:41 2003 +++ dotconf-1.0.13/src/dotconf.c Thu Jun 26 08:53:01 2003 @@ -485,9 +485,7 @@ void dotconf_set_command(configfile_t *configfile, const configoption_t *option, signed char *args, command_t *cmd) { - signed char *eob = 0; - - eob = args + strlen(args); + signed char *eob = args + strlen(args); /* fill in the command_t structure with values we already know */ cmd->name = option->type == ARG_NAME ? name : option->name; @@ -506,7 +504,7 @@ signed char *cp = args; /* check if it's a here-document and act accordingly */ - skip_whitespace(&cp, (int)eob - (int)cp, 0); + skip_whitespace(&cp, eob - cp, 0); if (!strncmp("<<", cp, 2)) { cmd->data.str = dotconf_get_here_document(configfile, cp + 2); @@ -605,7 +603,7 @@ cp1 = buffer; eob = cp1 + strlen(cp1); - skip_whitespace(&cp1, (int)eob - (int)cp1, 0); + skip_whitespace(&cp1, eob - cp1, 0); /* ignore comments and empty lines */ if (!cp1 || !*cp1 || *cp1 == '#' || *cp1 == '\n' || *cp1 == EOF)