SOURCES: qdbm-am_ac.patch - updated for 1.8.75 - added changes fro...

[twittner]

Author: twittner                     Date: Fri Mar  9 20:52:42 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.8.75
- added changes from -link.patch

---- Files affected:
SOURCES:
   qdbm-am_ac.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/qdbm-am_ac.patch
diff -u SOURCES/qdbm-am_ac.patch:1.12 SOURCES/qdbm-am_ac.patch:1.13
--- SOURCES/qdbm-am_ac.patch:1.12	Mon Oct 30 21:18:05 2006
+++ SOURCES/qdbm-am_ac.patch	Fri Mar  9 21:52:37 2007
@@ -1,136 +1,6 @@
-diff -Nur -x '*.orig' qdbm-1.8.73/Makefile.am n.qdbm-1.8.73/Makefile.am
---- qdbm-1.8.73/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.73/Makefile.am	2006-10-30 20:45:08.000000000 +0100
-@@ -0,0 +1,103 @@
-+AM_CPPFLAGS = -I.	-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-+					-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 \
-+					@MYDEFS@
-+
-+AM_CFLAGS = -Wall -fsigned-char @MYOPTS@
-+
-+lib_LTLIBRARIES = libqdbm.la
-+libqdbm_la_SOURCES = depot.c curia.c relic.c hovel.c cabin.c villa.c vista.c odeum.c myconf.c
-+include_HEADERS = depot.h curia.h relic.h hovel.h cabin.h villa.h vista.h odeum.h
-+libqdbm_la_LDFLAGS = -version-info @LIBVER@:@LIBREV@:@LIBAGE@
-+
-+bin_PROGRAMS = cbcodec cbtest crmgr crtest crtsv dpmgr dptest dptsv hvmgr hvtest odidx odmgr odtest qmttest rlmgr rltest vlmgr vltest vltsv
-+cbcodec_SOURCES = cbcodec.c
-+cbcodec_LDADD = libqdbm.la
-+cbtest_SOURCES = cbtest.c
-+cbtest_LDADD = libqdbm.la
-+crmgr_SOURCES = crmgr.c
-+crmgr_LDADD = libqdbm.la
-+crtest_SOURCES = crtest.c
-+crtest_LDADD = libqdbm.la
-+crtsv_SOURCES = crtsv.c
-+crtsv_LDADD = libqdbm.la
-+dpmgr_SOURCES = dpmgr.c
-+dpmgr_LDADD = libqdbm.la
-+dptest_SOURCES = dptest.c
-+dptest_LDADD = libqdbm.la
-+dptsv_SOURCES = dptsv.c
-+dptsv_LDADD = libqdbm.la
-+hvmgr_SOURCES = hvmgr.c
-+hvmgr_LDADD = libqdbm.la
-+hvtest_SOURCES = hvtest.c
-+hvtest_LDADD = libqdbm.la
-+odidx_SOURCES = odidx.c
-+odidx_LDADD = libqdbm.la
-+odmgr_SOURCES = odmgr.c
-+odmgr_LDADD = libqdbm.la
-+odtest_SOURCES = odtest.c
-+odtest_LDADD = libqdbm.la
-+qmttest_SOURCES = qmttest.c
-+qmttest_LDADD = libqdbm.la
-+rlmgr_SOURCES = rlmgr.c
-+rlmgr_LDADD = libqdbm.la
-+rltest_SOURCES = rltest.c
-+rltest_LDADD = libqdbm.la
-+vlmgr_SOURCES = vlmgr.c
-+vlmgr_LDADD = libqdbm.la
-+vltest_SOURCES = vltest.c
-+vltest_LDADD = libqdbm.la
-+vltsv_SOURCES = vltsv.c
-+vltsv_LDADD = libqdbm.la
-+
-+man1_MANS = \
-+	man/cbcodec.1 \
-+	man/cbtest.1 \
-+	man/crmgr.1 \
-+	man/crtest.1 \
-+	man/crtsv.1 \
-+	man/dpmgr.1 \
-+	man/dptest.1 \
-+	man/dptsv.1 \
-+	man/hvmgr.1 \
-+	man/hvtest.1 \
-+	man/odidx.1 \
-+	man/odmgr.1 \
-+	man/odtest.1 \
-+	man/qmttest.1 \
-+	man/rlmgr.1 \
-+	man/rltest.1 \
-+	man/vlmgr.1 \
-+	man/vltest.1 \
-+	man/vltsv.1
-+
-+man3_MANS = \
-+	man/cabin.3 \
-+	man/cropen.3 \
-+	man/curia.3 \
-+	man/depot.3 \
-+	man/dpopen.3 \
-+	man/hovel.3 \
-+	man/odeum.3 \
-+	man/odopen.3 \
-+	man/qdbm.3 \
-+	man/relic.3 \
-+	man/villa.3 \
-+	man/vista.3 \
-+	man/vlopen.3 \
-+	man/cabin.3 \
-+	man/cropen.3 \
-+	man/curia.3 \
-+	man/depot.3 \
-+	man/dpopen.3 \
-+	man/hovel.3 \
-+	man/odeum.3 \
-+	man/odopen.3 \
-+	man/qdbm.3 \
-+	man/relic.3 \
-+	man/villa.3 \
-+	man/vista.3 \
-+	man/vlopen.3
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = qdbm.pc
-+
-diff -Nur -x '*.orig' qdbm-1.8.73/cgi/Makefile.am n.qdbm-1.8.73/cgi/Makefile.am
---- qdbm-1.8.73/cgi/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.73/cgi/Makefile.am	2006-10-30 20:45:08.000000000 +0100
-@@ -0,0 +1,19 @@
-+AM_CPPFLAGS = -I..	-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-+					-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 -DNDEBUG
-+
-+AM_CFLAGS = -Wall -ansi -pedantic -fsigned-char
-+
-+libexec_PROGRAMS = qadm.cgi qupl.cgi qfts.cgi
-+
-+qadm_cgi_SOURCES = qadm.c
-+qadm_cgi_LDADD = ../libqdbm.la
-+
-+qupl_cgi_SOURCES = qupl.c
-+qupl_cgi_LDADD = ../libqdbm.la
-+
-+qfts_cgi_SOURCES = qfts.c
-+qfts_cgi_LDADD = ../libqdbm.la
-+
-+conf_templatesdir = $(datadir)/qdbm/cgi
-+conf_templates_DATA = qadm.conf qupl.conf qfts.conf
-+
-diff -Nur -x '*.orig' qdbm-1.8.73/cgi/configure.in n.qdbm-1.8.73/cgi/configure.in
---- qdbm-1.8.73/cgi/configure.in	2006-01-25 07:20:03.000000000 +0100
-+++ n.qdbm-1.8.73/cgi/configure.in	2006-10-30 20:45:08.000000000 +0100
+diff -Nur o.qdbm-1.8.75/cgi/configure.in qdbm-1.8.75/cgi/configure.in
+--- o.qdbm-1.8.75/cgi/configure.in	2006-01-25 07:20:03.000000000 +0100
++++ qdbm-1.8.75/cgi/configure.in	2007-03-09 21:39:19.000000000 +0100
 @@ -1,54 +1,12 @@
  # Source of configuration for CGI scripts of QDBM
  
@@ -235,22 +105,45 @@
 -
 -
  # END OF FILE
-diff -Nur -x '*.orig' qdbm-1.8.73/configure.in n.qdbm-1.8.73/configure.in
---- qdbm-1.8.73/configure.in	2006-10-26 07:57:08.000000000 +0200
-+++ n.qdbm-1.8.73/configure.in	2006-10-30 20:45:08.000000000 +0100
+diff -Nur o.qdbm-1.8.75/cgi/Makefile.am qdbm-1.8.75/cgi/Makefile.am
+--- o.qdbm-1.8.75/cgi/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ qdbm-1.8.75/cgi/Makefile.am	2007-03-09 21:39:19.000000000 +0100
+@@ -0,0 +1,19 @@
++AM_CPPFLAGS = -I..	-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
++					-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 -DNDEBUG
++
++AM_CFLAGS = -Wall -ansi -pedantic -fsigned-char
++
++libexec_PROGRAMS = qadm.cgi qupl.cgi qfts.cgi
++
++qadm_cgi_SOURCES = qadm.c
++qadm_cgi_LDADD = ../libqdbm.la
++
++qupl_cgi_SOURCES = qupl.c
++qupl_cgi_LDADD = ../libqdbm.la
++
++qfts_cgi_SOURCES = qfts.c
++qfts_cgi_LDADD = ../libqdbm.la
++
++conf_templatesdir = $(datadir)/qdbm/cgi
++conf_templates_DATA = qadm.conf qupl.conf qfts.conf
++
+diff -Nur o.qdbm-1.8.75/configure.in qdbm-1.8.75/configure.in
+--- o.qdbm-1.8.75/configure.in	2007-01-26 08:04:20.000000000 +0100
++++ qdbm-1.8.75/configure.in	2007-03-09 21:39:19.000000000 +0100
 @@ -9,27 +9,18 @@
  
  # Targets
- AC_INIT(qdbm, 1.8.73)
+ AC_INIT(qdbm, 1.8.75)
 +AM_INIT_AUTOMAKE([])
  
  # Export variables
 -LIBVER=14
--LIBREV=9
+-LIBREV=11
 -TARGETS="all"
-+LIBVER=23
++LIBVER=25
 +LIBREV=0
-+LIBAGE=9
++LIBAGE=11
 +
  MYDEFS=""
  MYOPTS=""
@@ -272,7 +165,7 @@
  
  #================================================================
  # Options
-@@ -43,24 +34,6 @@
+@@ -43,33 +34,6 @@
  isiconv=""
  isnowarn=""
  
@@ -294,10 +187,19 @@
 -  enables="$enables (devel)"
 -fi
 -
+-# Stable mode
+-AC_ARG_ENABLE(stable,
+-  AC_HELP_STRING([--enable-stable], [build for stable release]))
+-if test "$enable_stable" = "yes"
+-then
+-  TARGETS="stable"
+-  enables="$enables (stable)"
+-fi
+-
  # Enable POSIX thread
  AC_ARG_ENABLE(pthread,
    AC_HELP_STRING([--enable-pthread], [use POSIX thread and make APIs thread-safe]))
-@@ -182,40 +155,6 @@
+@@ -191,40 +155,6 @@
    MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
  fi
  
@@ -338,7 +240,7 @@
  #================================================================
  # Checking Libraries
  #================================================================
-@@ -261,18 +200,6 @@
+@@ -270,18 +200,6 @@
    LIBS=`printf '%s' "$LIBS" | sed 's/-lc/-lc_r/g'`
  fi
  
@@ -357,7 +259,7 @@
  #================================================================
  # Generic Settings
  #================================================================
-@@ -281,21 +208,12 @@
+@@ -290,21 +208,12 @@
  # Export variables
  AC_SUBST(LIBVER)
  AC_SUBST(LIBREV)
@@ -380,47 +282,323 @@
 -
 -
  # END OF FILE
-diff -Nur -x '*.orig' qdbm-1.8.73/java/Makefile.am n.qdbm-1.8.73/java/Makefile.am
---- qdbm-1.8.73/java/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.73/java/Makefile.am	2006-10-30 20:45:08.000000000 +0100
-@@ -0,0 +1,34 @@
-+AM_CPPFLAGS = -I..	-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 -D_POSIX_MAPPED_FILES=1 \
-+					-D_POSIX_SYNCHRONIZED_IO=1 -DPIC=1 -D_REENTRANT=1 -DNDEBUG \
-+					-I at MYJAVAHOME@/include -I at MYJAVAHOME@/include/@JVMPLATFORM@ -I at MYJAVAHOME@/Headers \
-+					@MYDEFS@
-+
-+AM_CFLAGS = -Wall -fsigned-char
-+
-+lib_LTLIBRARIES = libjqdbm.la
-+libjqdbm_la_SOURCES = jcuria.c jdepot.c jutil.c jvilla.c
-+libjqdbm_la_LDFLAGS = -version-info @LIBVER@:@LIBREV@:@LIBAGE@
-+libjqdbm_la_LIBADD = ../libqdbm.la
-+
-+qdbmdir = $(libdir)
-+qdbm_JAVA = \
-+	ADBM.java \
-+	Curia.java \
-+	CuriaException.java \
-+	CuriaTester.java \
-+	DBMException.java \
-+	Depot.java \
-+	DepotException.java \
-+	DepotTester.java \
-+	Util.java \
-+	Villa.java \
-+	VillaCursor.java \
-+	VillaException.java \
-+	VillaTester.java
-+
-+install-qdbmJAVA: classqdbm.stamp
-+	@JAR@ cvf qdbm.jar qdbm/*.class ; \
-+	test -z "$(qdbmdir)" || $(mkdir_p) "$(DESTDIR)$(qdbmdir)" ; \
-+	echo " $(INSTALL_DATA) 'qdbm.jar' '$(DESTDIR)$(qdbmdir)/'"; \
-+	$(INSTALL_DATA) "qdbm.jar" "$(DESTDIR)$(qdbmdir)/";
-+
-diff -Nur -x '*.orig' qdbm-1.8.73/java/configure.in n.qdbm-1.8.73/java/configure.in
---- qdbm-1.8.73/java/configure.in	2006-08-24 08:43:49.000000000 +0200
-+++ n.qdbm-1.8.73/java/configure.in	2006-10-30 20:45:08.000000000 +0100
+diff -Nur o.qdbm-1.8.75/configure.in.orig qdbm-1.8.75/configure.in.orig
+--- o.qdbm-1.8.75/configure.in.orig	1970-01-01 01:00:00.000000000 +0100
++++ qdbm-1.8.75/configure.in.orig	2007-01-26 08:04:20.000000000 +0100
+@@ -0,0 +1,310 @@
++# Source of configuration for QDBM
++
++
++
++#================================================================
++# Generic Settings
++#================================================================
++
++
++# Targets
++AC_INIT(qdbm, 1.8.75)
++
++# Export variables
++LIBVER=14
++LIBREV=11
++TARGETS="all"
++MYDEFS=""
++MYOPTS=""
++MGWLIBS=""
++LD="ld"
++AR="ar"
++
++# Building paths
++pathtmp="$PATH"
++PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
++PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
++LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
++LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
++CPATH="$HOME/include:/usr/local/include:$CPATH"
++export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
++
++
++
++#================================================================
++# Options
++#================================================================
++
++
++# Internal variables
++enables=""
++ispthread=""
++iszlib=""
++isiconv=""
++isnowarn=""
++
++# Debug mode
++AC_ARG_ENABLE(debug,
++  AC_HELP_STRING([--enable-debug], [build for debugging]))
++if test "$enable_debug" = "yes"
++then
++  TARGETS="debug"
++  enables="$enables (debug)"
++fi
++
++# Developping mode
++AC_ARG_ENABLE(devel,
++  AC_HELP_STRING([--enable-devel], [build for development]))
++if test "$enable_devel" = "yes"
++then
++  TARGETS="devel"
++  enables="$enables (devel)"
++fi
++
++# Stable mode
++AC_ARG_ENABLE(stable,
++  AC_HELP_STRING([--enable-stable], [build for stable release]))
++if test "$enable_stable" = "yes"
++then
++  TARGETS="stable"
++  enables="$enables (stable)"
++fi
++
++# Enable POSIX thread
++AC_ARG_ENABLE(pthread,
++  AC_HELP_STRING([--enable-pthread], [use POSIX thread and make APIs thread-safe]))
++if test "$enable_pthread" = "yes"
++then
++  MYDEFS="$MYDEFS -DMYPTHREAD"
++  enables="$enables (pthread)"
++  ispthread="yes"
++fi
++
++# Disable file locking
++AC_ARG_ENABLE(lock,
++  AC_HELP_STRING([--disable-lock], [build for environments without file locking]))
++if test "$enable_lock" = "no"
++then
++  MYDEFS="$MYDEFS -DMYNOLOCK"
++  enables="$enables (no-lock)"
++fi
++
++# Disable memory mapping
++AC_ARG_ENABLE(mmap,
++  AC_HELP_STRING([--disable-mmap], [build for environments without memory mapping]))
++if test "$enable_mmap" = "no"
++then
++  MYDEFS="$MYDEFS -DMYNOMMAP"
++  enables="$enables (no-mmap)"
++fi
++
++# Enable ZLIB compression
++AC_ARG_ENABLE(zlib,
++  AC_HELP_STRING([--enable-zlib], [feature ZLIB for B+ tree and inverted index]))
++if test "$enable_zlib" = "yes"
++then
++  MYDEFS="$MYDEFS -DMYZLIB"
++  MGWLIBS="-lz $MGWLIBS"
++  enables="$enables (zlib)"
++  iszlib="yes"
++fi
++
++# Enable LZO compression
++AC_ARG_ENABLE(lzo,
++  AC_HELP_STRING([--enable-lzo], [feature LZO for B+ tree and inverted index]))
++if test "$enable_lzo" = "yes"
++then
++  MYDEFS="$MYDEFS -DMYLZO"
++  MGWLIBS="-llzo2 $MGWLIBS"
++  enables="$enables (lzo)"
++  islzo="yes"
++fi
++
++# Enable BZIP2 compression
++AC_ARG_ENABLE(bzip,
++  AC_HELP_STRING([--enable-bzip], [feature BZIP2 for B+ tree and inverted index]))
++if test "$enable_bzip" = "yes"
++then
++  MYDEFS="$MYDEFS -DMYBZIP"
++  MGWLIBS="-lbz2 $MGWLIBS"
++  enables="$enables (bzip)"
++  isbzip="yes"
++fi
++
++# Enable ICONV utilities
++AC_ARG_ENABLE(iconv,
++  AC_HELP_STRING([--enable-iconv], [feature ICONV utilities]))
++if test "$enable_iconv" = "yes"
++then
++  MYDEFS="$MYDEFS -DMYICONV"
++  MGWLIBS="-liconv $MGWLIBS"
++  enables="$enables (iconv)"
++  isiconv="yes"
++fi
++
++# No warning configuration
++AC_ARG_ENABLE(warn,
++  AC_HELP_STRING([--disable-warn], [hide warnings in the configuration]))
++if test "$enable_warn" = "no"
++then
++  isnowarn="yes"
++fi
++
++# Messages
++printf '#================================================================\n'
++printf '# Configuring QDBM version %s%s.\n' "$PACKAGE_VERSION" "$enables"
++printf '#================================================================\n'
++
++
++
++#================================================================
++# Checking Commands to Build with
++#================================================================
++
++
++# C compiler
++AC_PROG_CC
++if test "$GCC" != "yes"
++then
++  if test "$isnowarn" != "yes"
++  then
++    printf '#================================================================\n' 1>&2
++    printf '# WARNING: GCC is required to build this package.\n' 1>&2
++    printf '#================================================================\n' 1>&2
++  fi
++fi
++if uname | egrep -i 'Linux' > /dev/null 2>&1 &&
++  uname -m | egrep '(x|i)(3|4|5|6|7|8|9)?86' > /dev/null 2>&1
++then
++  MYOPTS="-minline-all-stringops"
++fi
++if uname | egrep -i 'SunOS' > /dev/null 2>&1
++then
++  MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
++fi
++if uname | egrep -i 'BSD' > /dev/null 2>&1
++then
++  MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
++fi
++if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
++then
++  MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
++fi
++
++# Linker
++printf 'checking for ld... '
++if which ld | grep '/ld$' > /dev/null 2>&1
++then
++  LD=`which ld`
++  printf '%s\n' "$LD"
++else
++  printf 'no\n'
++  if test "$isnowarn" != "yes"
++  then
++    printf '#================================================================\n' 1>&2
++    printf '# WARNING: ld is not found in PATH.\n' 1>&2
++    printf '#================================================================\n' 1>&2
++  fi
++fi
++
++# Archiver
++printf 'checking for ar... '
++if which ar | grep '/ar$' > /dev/null 2>&1
++then
++  AR=`which ar`
++  printf '%s\n' "$AR"
++else
++  printf 'no\n'
++  if test "$isnowarn" != "yes"
++  then
++    printf '#================================================================\n' 1>&2
++    printf '# WARNING: ar is not found in PATH.\n' 1>&2
++    printf '#================================================================\n' 1>&2
++  fi
++fi
++
++
++
++#================================================================
++# Checking Libraries
++#================================================================
++
++
++# Underlying libraries
++AC_CHECK_LIB(c, main)
++
++# for pthread
++if test "$ispthread" = "yes"
++then
++  AC_CHECK_LIB(pthread, main)
++fi
++
++# for zlib
++if test "$iszlib" = "yes"
++then
++  AC_CHECK_LIB(z, main)
++fi
++
++# for lzo
++if test "$islzo" = "yes"
++then
++  AC_CHECK_LIB(lzo2, main)
++fi
++
++# for bzip
++if test "$isbzip" = "yes"
++then
++  AC_CHECK_LIB(bz2, main)
++fi
++
++# for iconv
++if test "$isiconv" = "yes"
++then
++  AC_CHECK_LIB(iconv, main)
++fi
++
++# For old BSDs
++if test "$ispthread" = "yes" && uname -a | grep BSD > /dev/null &&
++  test -f /usr/lib/libc_r.a && test ! -f /usr/lib/libpthread.a
++then
++  LIBS=`printf '%s' "$LIBS" | sed 's/-lc/-lc_r/g'`
++fi
++
++# Duplication of QDBM for C
++AC_CHECK_LIB(qdbm, main,
++  if test "$isnowarn" != "yes"
++  then
++    printf '#================================================================\n' 1>&2
++    printf '# WARNING: The existing library was detected.\n' 1>&2
++    printf '#================================================================\n' 1>&2
++  fi
++)
++
++
++
++#================================================================
++# Generic Settings
++#================================================================
++
++
++# Export variables
++AC_SUBST(LIBVER)
++AC_SUBST(LIBREV)
++AC_SUBST(TARGETS)
++AC_SUBST(MYDEFS)
++AC_SUBST(MYOPTS)
++AC_SUBST(MGWLIBS)
++AC_SUBST(LD)
++AC_SUBST(AR)
++
++# Targets
++AC_OUTPUT(Makefile LTmakefile qdbm.spec qdbm.pc)
++
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/qdbm-am_ac.patch?r1=1.12&r2=1.13&f=u