SOURCES: qdbm-am_ac.patch - up to 1.8.73

[twittner]

Author: twittner                     Date: Mon Oct 30 20:07:56 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 1.8.73

---- Files affected:
SOURCES:
   qdbm-am_ac.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/qdbm-am_ac.patch
diff -u SOURCES/qdbm-am_ac.patch:1.10 SOURCES/qdbm-am_ac.patch:1.11
--- SOURCES/qdbm-am_ac.patch:1.10	Sat Sep  9 02:10:07 2006
+++ SOURCES/qdbm-am_ac.patch	Mon Oct 30 21:07:50 2006
@@ -1,9 +1,9 @@
-diff -Nur o.qdbm-1.8.48/Makefile.am n.qdbm-1.8.48/Makefile.am
---- o.qdbm-1.8.48/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.48/Makefile.am	2006-04-20 21:32:07.000000000 +0200
+diff -Nur 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_REENTRANT=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@
@@ -105,9 +105,9 @@
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = qdbm.pc
 +
-diff -Nur o.qdbm-1.8.48/cgi/Makefile.am n.qdbm-1.8.48/cgi/Makefile.am
---- o.qdbm-1.8.48/cgi/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.48/cgi/Makefile.am	2006-04-20 21:32:07.000000000 +0200
+diff -Nur 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
@@ -128,9 +128,9 @@
 +conf_templatesdir = $(datadir)/qdbm/cgi
 +conf_templates_DATA = qadm.conf qupl.conf qfts.conf
 +
-diff -Nur o.qdbm-1.8.48/cgi/configure.in n.qdbm-1.8.48/cgi/configure.in
---- o.qdbm-1.8.48/cgi/configure.in	2006-04-17 15:40:45.000000000 +0200
-+++ n.qdbm-1.8.48/cgi/configure.in	2006-04-20 21:46:42.000000000 +0200
+diff -Nur 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
 @@ -1,54 +1,12 @@
  # Source of configuration for CGI scripts of QDBM
  
@@ -235,22 +235,22 @@
 -
 -
  # END OF FILE
-diff -Nur o.qdbm-1.8.48/configure.in n.qdbm-1.8.48/configure.in
---- o.qdbm-1.8.48/configure.in	2006-04-17 15:40:44.000000000 +0200
-+++ n.qdbm-1.8.48/configure.in	2006-04-20 21:38:04.000000000 +0200
+diff -Nur 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
 @@ -9,27 +9,18 @@
  
  # Targets
- AC_INIT(qdbm, 1.8.70)
+ AC_INIT(qdbm, 1.8.73)
 +AM_INIT_AUTOMAKE([])
  
  # Export variables
 -LIBVER=14
--LIBREV=6
+-LIBREV=9
 -TARGETS="all"
-+LIBVER=20
++LIBVER=23
 +LIBREV=0
-+LIBAGE=6
++LIBAGE=9
 +
  MYDEFS=""
  MYOPTS=""
@@ -272,7 +272,7 @@
  
  #================================================================
  # Options
-@@ -42,24 +33,6 @@
+@@ -43,24 +34,6 @@
  isiconv=""
  isnowarn=""
  
@@ -297,8 +297,8 @@
  # Enable POSIX thread
  AC_ARG_ENABLE(pthread,
    AC_HELP_STRING([--enable-pthread], [use POSIX thread and make APIs thread-safe]))
-@@ -164,40 +137,6 @@
-   fi
+@@ -182,40 +155,6 @@
+   MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
  fi
  
 -# Linker
@@ -338,8 +338,8 @@
  #================================================================
  # Checking Libraries
  #================================================================
-@@ -236,18 +175,6 @@
-   AC_CHECK_LIB(iconv, main)
+@@ -261,18 +200,6 @@
+   LIBS=`printf '%s' "$LIBS" | sed 's/-lc/-lc_r/g'`
  fi
  
 -# Duplication of QDBM for C
@@ -357,14 +357,14 @@
  #================================================================
  # Generic Settings
  #================================================================
-@@ -257,21 +184,12 @@
+@@ -281,21 +208,12 @@
  # Export variables
  AC_SUBST(LIBVER)
  AC_SUBST(LIBREV)
 -AC_SUBST(TARGETS)
 +AC_SUBST(LIBAGE)
- AC_SUBST(MYOPTS)
  AC_SUBST(MYDEFS)
+ AC_SUBST(MYOPTS)
  AC_SUBST(MGWLIBS)
 -AC_SUBST(LD)
 -AC_SUBST(AR)
@@ -380,9 +380,314 @@
 -
 -
  # END OF FILE
-diff -Nur o.qdbm-1.8.48/java/Makefile.am n.qdbm-1.8.48/java/Makefile.am
---- o.qdbm-1.8.48/java/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.48/java/Makefile.am	2006-04-20 21:32:07.000000000 +0200
+diff -Nur qdbm-1.8.73/configure.in.orig n.qdbm-1.8.73/configure.in.orig
+--- qdbm-1.8.73/configure.in.orig	1970-01-01 01:00:00.000000000 +0100
++++ n.qdbm-1.8.73/configure.in.orig	2006-10-26 07:57:08.000000000 +0200
+@@ -0,0 +1,301 @@
++# Source of configuration for QDBM
++
++
++
++#================================================================
++# Generic Settings
++#================================================================
++
++
++# Targets
++AC_INIT(qdbm, 1.8.73)
++
++# Export variables
++LIBVER=14
++LIBREV=9
++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
++
++# 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)
++
++# Messages
++printf '#================================================================\n'
++printf '# Ready to make.\n'
++printf '#================================================================\n'
++
++
++
++# END OF FILE
+diff -Nur 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 \
@@ -418,9 +723,9 @@
 +	echo " $(INSTALL_DATA) 'qdbm.jar' '$(DESTDIR)$(qdbmdir)/'"; \
 +	$(INSTALL_DATA) "qdbm.jar" "$(DESTDIR)$(qdbmdir)/";
 +
-diff -Nur o.qdbm-1.8.48/java/configure.in n.qdbm-1.8.48/java/configure.in
---- o.qdbm-1.8.48/java/configure.in	2006-04-17 15:40:44.000000000 +0200
-+++ n.qdbm-1.8.48/java/configure.in	2006-04-20 21:37:18.000000000 +0200
+diff -Nur 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
 @@ -1,19 +1,12 @@
  # Source of configuration for Java interface of QDBM
  
@@ -443,10 +748,11 @@
  MYJAVAHOME="/usr/java"
  JVMPLATFORM="linux"
  JAVAC="javac"
-@@ -22,46 +15,13 @@
+@@ -22,47 +15,13 @@
  JAVADOC="javadoc"
  JAVARUN="java"
  MYDEFS=""
+-MYOPTS=""
 -LD="ld"
 -
 -# Building paths
@@ -491,7 +797,33 @@
  #================================================================
  # Checking Commands to Build with
  #================================================================
-@@ -183,29 +143,6 @@
+@@ -154,18 +113,6 @@
+   printf '# WARNING: GCC is required to build this package.\n' 1>&2
+   printf '#================================================================\n' 1>&2
+ fi
+-if uname | egrep -i 'SunOS' > /dev/null 2>&1
+-then
+-  MYOPTS="-O1"
+-fi
+-if uname | egrep -i 'BSD' > /dev/null 2>&1
+-then
+-  MYOPTS="-O1"
+-fi
+-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
+-then
+-  MYOPTS="-O1"
+-fi
+ 
+ # Linker
+ printf 'checking for ld... '
+@@ -189,42 +136,13 @@
+ 
+ # Underlying libraries
+ AC_CHECK_LIB(c, main)
++AC_CHECK_LIB(c_r, main)
+ AC_CHECK_LIB(pthread, main)
+ AC_CHECK_LIB(z, main)
+ AC_CHECK_LIB(lzo2, main)
  AC_CHECK_LIB(bz2, main)
  AC_CHECK_LIB(iconv, main)
  
@@ -509,6 +841,13 @@
 -  fi
 -)
 -
+-# For old BSDs
+-if 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 Java
 -AC_CHECK_LIB(jqdbm, main,
 -  printf '#================================================================\n' 1>&2
@@ -521,7 +860,7 @@
  #================================================================
  # Generic Settings
  #================================================================
-@@ -222,7 +159,7 @@
+@@ -241,7 +159,7 @@
  # Export variables
  AC_SUBST(LIBVER)
  AC_SUBST(LIBREV)
@@ -530,10 +869,11 @@
  AC_SUBST(MYJAVAHOME)
  AC_SUBST(JVMPLATFORM)
  AC_SUBST(JAVAC)
-@@ -231,11 +168,8 @@
+@@ -250,12 +168,8 @@
  AC_SUBST(JAVADOC)
  AC_SUBST(JAVARUN)
  AC_SUBST(MYDEFS)
+-AC_SUBST(MYOPTS)
 -AC_SUBST(LD)
  
  # Targets
@@ -542,9 +882,256 @@
 -
 -
  # END OF FILE
-diff -Nur o.qdbm-1.8.48/perl/Makefile.in n.qdbm-1.8.48/perl/Makefile.in
---- o.qdbm-1.8.48/perl/Makefile.in	2006-04-17 15:40:45.000000000 +0200
-+++ n.qdbm-1.8.48/perl/Makefile.in	2006-04-20 21:32:07.000000000 +0200
+diff -Nur qdbm-1.8.73/java/configure.in.orig n.qdbm-1.8.73/java/configure.in.orig
+--- qdbm-1.8.73/java/configure.in.orig	1970-01-01 01:00:00.000000000 +0100
++++ n.qdbm-1.8.73/java/configure.in.orig	2006-10-30 20:45:08.000000000 +0100
+@@ -0,0 +1,243 @@
++# Source of configuration for Java interface of QDBM
++
++
++
++#================================================================
++# Generic Settings
++#================================================================
++
++
++# Targets
++AC_INIT(qdbm-java, 1.0.0)
++
++# Export variables
++LIBVER=1
++LIBREV=0
++TARGETS="all"
++MYJAVAHOME="/usr/java"
++JVMPLATFORM="linux"
++JAVAC="javac"
++JAR="jar"
++JAVAH="javah"
++JAVADOC="javadoc"
++JAVARUN="java"
++MYDEFS=""
++MYOPTS=""
++LD="ld"
++
++# 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
++#================================================================
++
++
++# Debug mode
++AC_ARG_ENABLE(debug,
++  AC_HELP_STRING([--enable-debug], [build for debugging]))
++if test "$enable_debug" = "yes"
++then
<<Diff was trimmed, longer than 597 lines>>

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