[patch] dotconfpp-0.0.4a-build.patch

dotconfpp-0.0.4a-build.patch (text/plain), 13.70 KB, created by Alexander Kahl on 2005-09-06 16:11:19 UTC

diff -Naur dotconfpp-0.0.4a.orig/configure.in dotconfpp-0.0.4a/configure.in
--- dotconfpp-0.0.4a.orig/configure.in	2004-06-25 12:08:12.000000000 +0200
+++ dotconfpp-0.0.4a/configure.in	2005-09-06 23:11:20.000000000 +0200
@@ -2,15 +2,33 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(dotconfpp, 0.0.4a, [e-mail])
+
+m4_define(dotconfpp_version_major, 0)
+m4_define(dotconfpp_version_minor, 0)
+m4_define(dotconfpp_version_micro, 4)
+
+AC_INIT([dotconfpp],
+	 dotconfpp_version_major, dotconfpp_version_minor, dotconfpp_version_micro,
+	 [[e-mail]])
 AC_CONFIG_SRCDIR([src/dotconfpp.cc])
 AC_CONFIG_HEADER([config.h])
 
-
 AC_PROG_LIBTOOL
 
-AM_INIT_AUTOMAKE(dotconfpp, 0.0.4a, [e-mail])
+AM_INIT_AUTOMAKE([1.7])
 
+LT_CURRENT=0
+LT_REVISION=4
+LT_AGE=0
+VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+AC_SUBST(VERSION_INFO)
+DOTCONFPP_VERSION_MAJOR=dotconfpp_version_major()
+DOTCONFPP_VERSION_MINOR=dotconfpp_version_minor()
+DOTCONFPP_VERSION_MICRO=dotconfpp_version_micro()
+AC_SUBST(DOTCONFPP_VERSION_MAJOR)
+AC_SUBST(DOTCONFPP_VERSION_MINOR)
+AC_SUBST(DOTCONFPP_VERSION_MICRO)
+AC_SUBST(DOTCONFPP_VERSION_OTHER)
 
 # Checks for programs.
 AC_PROG_CXX
diff -Naur dotconfpp-0.0.4a.orig/Makefile.in dotconfpp-0.0.4a/Makefile.in
--- dotconfpp-0.0.4a.orig/Makefile.in	2004-06-25 12:12:52.000000000 +0200
+++ dotconfpp-0.0.4a/Makefile.in	2005-09-06 23:30:54.000000000 +0200
@@ -58,6 +58,10 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOTCONFPP_VERSION_MAJOR = @DOTCONFPP_VERSION_MAJOR@
+DOTCONFPP_VERSION_MICRO = @DOTCONFPP_VERSION_MICRO@
+DOTCONFPP_VERSION_MINOR = @DOTCONFPP_VERSION_MINOR@
+DOTCONFPP_VERSION_OTHER = @DOTCONFPP_VERSION_OTHER@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -90,6 +94,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_INFO = @VERSION_INFO@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
diff -Naur dotconfpp-0.0.4a.orig/src/example1/Makefile.in dotconfpp-0.0.4a/src/example1/Makefile.in
--- dotconfpp-0.0.4a.orig/src/example1/Makefile.in	2004-06-25 12:13:15.000000000 +0200
+++ dotconfpp-0.0.4a/src/example1/Makefile.in	2005-09-06 23:30:55.000000000 +0200
@@ -58,6 +58,10 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOTCONFPP_VERSION_MAJOR = @DOTCONFPP_VERSION_MAJOR@
+DOTCONFPP_VERSION_MICRO = @DOTCONFPP_VERSION_MICRO@
+DOTCONFPP_VERSION_MINOR = @DOTCONFPP_VERSION_MINOR@
+DOTCONFPP_VERSION_OTHER = @DOTCONFPP_VERSION_OTHER@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -90,6 +94,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_INFO = @VERSION_INFO@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
diff -Naur dotconfpp-0.0.4a.orig/src/example2/Makefile.in dotconfpp-0.0.4a/src/example2/Makefile.in
--- dotconfpp-0.0.4a.orig/src/example2/Makefile.in	2004-06-25 12:13:18.000000000 +0200
+++ dotconfpp-0.0.4a/src/example2/Makefile.in	2005-09-06 23:30:55.000000000 +0200
@@ -58,6 +58,10 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOTCONFPP_VERSION_MAJOR = @DOTCONFPP_VERSION_MAJOR@
+DOTCONFPP_VERSION_MICRO = @DOTCONFPP_VERSION_MICRO@
+DOTCONFPP_VERSION_MINOR = @DOTCONFPP_VERSION_MINOR@
+DOTCONFPP_VERSION_OTHER = @DOTCONFPP_VERSION_OTHER@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -90,6 +94,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_INFO = @VERSION_INFO@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
diff -Naur dotconfpp-0.0.4a.orig/src/Makefile.am dotconfpp-0.0.4a/src/Makefile.am
--- dotconfpp-0.0.4a.orig/src/Makefile.am	2003-05-14 17:10:26.000000000 +0200
+++ dotconfpp-0.0.4a/src/Makefile.am	2005-09-06 23:27:19.000000000 +0200
@@ -1,15 +1,14 @@
 EXTRA_DIST = dotconfpp.h mempool.h mempool.cc
 
-LIBdir = /usr/local/lib
-includedir = /usr/local/include/dotconf++
+dotconfppincludedir = $(includedir)/dotconf++
 SUBDIRS = . example1 example2
 
 INCLUDES = -I.
 AM_CPPFLAGS = -D_REENTRANT -fno-exceptions -fno-rtti -fomit-frame-pointer -fexpensive-optimizations -pipe -Werror -Wall
 
-LIB_LTLIBRARIES = libdotconfpp.la
+lib_LTLIBRARIES = libdotconfpp.la
 
 libdotconfpp_la_SOURCES = dotconfpp.cc mempool.cc
-include_HEADERS = dotconfpp.h mempool.h
+dotconfppinclude_HEADERS = dotconfpp.h mempool.h
 
-libdotconfpp_la_LDFLAGS = -version-info 0:3:0 -export-dynamic
+libdotconfpp_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic
diff -Naur dotconfpp-0.0.4a.orig/src/Makefile.in dotconfpp-0.0.4a/src/Makefile.in
--- dotconfpp-0.0.4a.orig/src/Makefile.in	2004-06-25 12:13:09.000000000 +0200
+++ dotconfpp-0.0.4a/src/Makefile.in	2005-09-06 23:30:55.000000000 +0200
@@ -58,6 +58,10 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOTCONFPP_VERSION_MAJOR = @DOTCONFPP_VERSION_MAJOR@
+DOTCONFPP_VERSION_MICRO = @DOTCONFPP_VERSION_MICRO@
+DOTCONFPP_VERSION_MINOR = @DOTCONFPP_VERSION_MINOR@
+DOTCONFPP_VERSION_OTHER = @DOTCONFPP_VERSION_OTHER@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -90,6 +94,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_INFO = @VERSION_INFO@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
@@ -116,7 +121,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
-includedir = /usr/local/include/dotconf++
+includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
@@ -132,24 +137,24 @@
 target_alias = @target_alias@
 EXTRA_DIST = dotconfpp.h mempool.h mempool.cc
 
-LIBdir = /usr/local/lib
+dotconfppincludedir = $(includedir)/dotconf++
 SUBDIRS = . example1 example2
 
 INCLUDES = -I.
 AM_CPPFLAGS = -D_REENTRANT -fno-exceptions -fno-rtti -fomit-frame-pointer -fexpensive-optimizations -pipe -Werror -Wall
 
-LIB_LTLIBRARIES = libdotconfpp.la
+lib_LTLIBRARIES = libdotconfpp.la
 
 libdotconfpp_la_SOURCES = dotconfpp.cc mempool.cc
-include_HEADERS = dotconfpp.h mempool.h
+dotconfppinclude_HEADERS = dotconfpp.h mempool.h
 
-libdotconfpp_la_LDFLAGS = -version-info 0:3:0 -export-dynamic
+libdotconfpp_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(LIB_LTLIBRARIES)
+LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libdotconfpp_la_LIBADD =
 am_libdotconfpp_la_OBJECTS = dotconfpp.lo mempool.lo
@@ -169,7 +174,7 @@
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(libdotconfpp_la_SOURCES)
-HEADERS = $(include_HEADERS)
+HEADERS = $(dotconfppinclude_HEADERS)
 
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
@@ -177,7 +182,8 @@
 	all-recursive install-data-recursive install-exec-recursive \
 	installdirs-recursive install-recursive uninstall-recursive \
 	check-recursive installcheck-recursive
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
+DIST_COMMON = $(dotconfppinclude_HEADERS) $(srcdir)/Makefile.in \
+	Makefile.am
 DIST_SUBDIRS = $(SUBDIRS)
 SOURCES = $(libdotconfpp_la_SOURCES)
 
@@ -190,36 +196,36 @@
 	  $(AUTOMAKE) --gnu  src/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-LIBLTLIBRARIES_INSTALL = $(INSTALL)
-install-LIBLTLIBRARIES: $(LIB_LTLIBRARIES)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(LIBdir)
-	@list='$(LIB_LTLIBRARIES)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(LIBLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(LIBdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(LIBLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(LIBdir)/$$f; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
 	  else :; fi; \
 	done
 
-uninstall-LIBLTLIBRARIES:
+uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(LIB_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(LIBdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(LIBdir)/$$p; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
-clean-LIBLTLIBRARIES:
-	-test -z "$(LIB_LTLIBRARIES)" || rm -f $(LIB_LTLIBRARIES)
-	@list='$(LIB_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" = "$$p" && dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libdotconfpp.la: $(libdotconfpp_la_OBJECTS) $(libdotconfpp_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(LIBdir) $(libdotconfpp_la_LDFLAGS) $(libdotconfpp_la_OBJECTS) $(libdotconfpp_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libdotconfpp_la_LDFLAGS) $(libdotconfpp_la_OBJECTS) $(libdotconfpp_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -272,23 +278,23 @@
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-install-includeHEADERS: $(include_HEADERS)
+dotconfppincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+install-dotconfppincludeHEADERS: $(dotconfppinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
-	@list='$(include_HEADERS)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(dotconfppincludedir)
+	@list='$(dotconfppinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  echo " $(dotconfppincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(dotconfppincludedir)/$$f"; \
+	  $(dotconfppincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(dotconfppincludedir)/$$f; \
 	done
 
-uninstall-includeHEADERS:
+uninstall-dotconfppincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; for p in $$list; do \
+	@list='$(dotconfppinclude_HEADERS)'; for p in $$list; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  echo " rm -f $(DESTDIR)$(dotconfppincludedir)/$$f"; \
+	  rm -f $(DESTDIR)$(dotconfppincludedir)/$$f; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -464,7 +470,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(LIBdir) $(DESTDIR)$(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(dotconfppincludedir)
 
 install: install-recursive
 install-exec: install-exec-recursive
@@ -492,7 +498,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-LIBLTLIBRARIES clean-generic clean-libtool \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -509,9 +515,9 @@
 
 info-am:
 
-install-data-am: install-LIBLTLIBRARIES install-includeHEADERS
+install-data-am: install-dotconfppincludeHEADERS
 
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 
 install-info: install-info-recursive
 
@@ -537,30 +543,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-LIBLTLIBRARIES uninstall-includeHEADERS \
-	uninstall-info-am
+uninstall-am: uninstall-dotconfppincludeHEADERS uninstall-info-am \
+	uninstall-libLTLIBRARIES
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-LIBLTLIBRARIES clean-generic clean-libtool \
+	clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-recursive ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install \
-	install-LIBLTLIBRARIES install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-includeHEADERS install-info \
-	install-info-am install-info-recursive install-man \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-dotconfppincludeHEADERS install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-libLTLIBRARIES install-man \
 	install-recursive install-strip installcheck installcheck-am \
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-LIBLTLIBRARIES uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	tags-recursive uninstall uninstall-am \
+	uninstall-dotconfppincludeHEADERS uninstall-info-am \
+	uninstall-info-recursive uninstall-libLTLIBRARIES \
+	uninstall-recursive
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.