SOURCES: qdbm-am_ac.patch - fixed empty PACKAGE_VERSION

twittner twittner at pld-linux.org
Thu Apr 20 21:48:38 CEST 2006 

Author: twittner                     Date: Thu Apr 20 19:48:38 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed empty PACKAGE_VERSION

---- Files affected:
SOURCES:
   qdbm-am_ac.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/qdbm-am_ac.patch
diff -u SOURCES/qdbm-am_ac.patch:1.1 SOURCES/qdbm-am_ac.patch:1.2
--- SOURCES/qdbm-am_ac.patch:1.1	Mon Apr 17 16:45:52 2006
+++ SOURCES/qdbm-am_ac.patch	Thu Apr 20 21:48:33 2006
@@ -1,6 +1,6 @@
 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-17 16:00:08.000000000 +0200
++++ n.qdbm-1.8.48/Makefile.am	2006-04-20 21:32:07.000000000 +0200
 @@ -0,0 +1,100 @@
 +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 \
@@ -104,7 +104,7 @@
 +
 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-17 15:40:47.000000000 +0200
++++ n.qdbm-1.8.48/cgi/Makefile.am	2006-04-20 21:32:07.000000000 +0200
 @@ -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
@@ -127,8 +127,8 @@
 +
 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-17 15:40:47.000000000 +0200
-@@ -1,54 +1,13 @@
++++ n.qdbm-1.8.48/cgi/configure.in	2006-04-20 21:36:49.000000000 +0200
+@@ -1,54 +1,12 @@
  # Source of configuration for CGI scripts of QDBM
  
 -
@@ -139,7 +139,7 @@
  
 -
 -# Targets
--AC_INIT(qdbm-cgi, 0.0.1)
+ AC_INIT(qdbm-cgi, 0.0.1)
 -
 -# Export variables
 -TARGETS="all"
@@ -180,14 +180,12 @@
 -# Checking Commands to Build with
 -#================================================================
 -
-+AC_INIT([Makefile.am])
-+AM_INIT_AUTOMAKE(qdbm-cgi, 0.0.1, [])
-+#AC_CONFIG_HEADER([config.h])
++AM_INIT_AUTOMAKE([])
 +AC_PROG_LIBTOOL
  
  # C compiler
  AC_PROG_CC
-@@ -60,12 +19,10 @@
+@@ -60,12 +18,10 @@
  fi
  
  
@@ -200,7 +198,7 @@
  # Underlying libraries
  AC_CHECK_LIB(c, main)
  AC_CHECK_LIB(pthread, main)
-@@ -74,33 +31,10 @@
+@@ -74,33 +30,10 @@
  AC_CHECK_LIB(bz2, main)
  AC_CHECK_LIB(iconv, main)
  
@@ -234,17 +232,58 @@
 -
 -
  # END OF FILE
+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~	1970-01-01 01:00:00.000000000 +0100
++++ n.qdbm-1.8.48/cgi/configure.in~	2006-04-20 21:32:07.000000000 +0200
+@@ -0,0 +1,40 @@
++# Source of configuration for CGI scripts of QDBM
++
++#================================================================
++# Generic Settings
++#================================================================
++
++AC_INIT([Makefile.am])
++AM_INIT_AUTOMAKE(qdbm-cgi, 0.0.1, [])
++#AC_CONFIG_HEADER([config.h])
++AC_PROG_LIBTOOL
++
++# C compiler
++AC_PROG_CC
++if test "$GCC" != "yes"
++then
++  printf '#================================================================\n' 1>&2
++  printf '# WARNING: GCC is required to build this package.\n' 1>&2
++  printf '#================================================================\n' 1>&2
++fi
++
++
++#================================================================
++# Checking Libraries
++#================================================================
++
++# Underlying libraries
++AC_CHECK_LIB(c, 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)
++
++#================================================================
++# Generic Settings
++#================================================================
++
++AC_OUTPUT(Makefile)
++
++# 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-17 15:40:45.000000000 +0200
-@@ -8,27 +8,19 @@
- 
++++ n.qdbm-1.8.48/configure.in	2006-04-20 21:38:04.000000000 +0200
+@@ -9,26 +9,17 @@
  
  # Targets
--AC_INIT(qdbm, 1.8.48)
-+AC_INIT([Makefile.am])
-+AM_INIT_AUTOMAKE(qdbm, 1.8.48, [])
-+#AC_CONFIG_HEADER([config.h])
+ AC_INIT(qdbm, 1.8.48)
++AM_INIT_AUTOMAKE([])
  
  # Export variables
 -LIBVER=12
@@ -273,7 +312,7 @@
  
  #================================================================
  # Options
-@@ -42,24 +34,6 @@
+@@ -42,24 +33,6 @@
  isiconv=""
  isnowarn=""
  
@@ -298,7 +337,7 @@
  # Enable POSIX thread
  AC_ARG_ENABLE(pthread,
    AC_HELP_STRING([--enable-pthread], [use POSIX thread and make APIs thread-safe]))
-@@ -164,40 +138,6 @@
+@@ -164,40 +137,6 @@
    fi
  fi
  
@@ -339,7 +378,7 @@
  #================================================================
  # Checking Libraries
  #================================================================
-@@ -236,18 +176,6 @@
+@@ -236,18 +175,6 @@
    AC_CHECK_LIB(iconv, main)
  fi
  
@@ -358,7 +397,7 @@
  #================================================================
  # Generic Settings
  #================================================================
-@@ -256,20 +184,11 @@
+@@ -256,20 +183,11 @@
  # Export variables
  AC_SUBST(LIBVER)
  AC_SUBST(LIBREV)
@@ -380,9 +419,206 @@
 -
 -
  # 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~	1970-01-01 01:00:00.000000000 +0100
++++ n.qdbm-1.8.48/configure.in~	2006-04-20 21:33:12.000000000 +0200
+@@ -0,0 +1,193 @@
++# Source of configuration for QDBM
++
++
++
++#================================================================
++# Generic Settings
++#================================================================
++
++
++# Targets
++AC_INIT(qdbm, 1.8.48)
++AM_INIT_AUTOMAKE([])
++
++# Export variables
++LIBVER=21
++LIBREV=0
++LIBAGE=9
++
++MYDEFS=""
++MGWLIBS=""
++
++AC_PROG_LIBTOOL
++
++#================================================================
++# Options
++#================================================================
++
++
++# Internal variables
++enables=""
++ispthread=""
++iszlib=""
++isiconv=""
++isnowarn=""
++
++# 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
++
++#================================================================
++# 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
++
++#================================================================
++# Generic Settings
++#================================================================
++
++
++# Export variables
++AC_SUBST(LIBVER)
++AC_SUBST(LIBREV)
++AC_SUBST(LIBAGE)
++AC_SUBST(MYDEFS)
++AC_SUBST(MGWLIBS)
++
++# Targets
++AC_OUTPUT(Makefile LTmakefile qdbm.spec qdbm.pc)
++
++# 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-17 15:40:46.000000000 +0200
++++ n.qdbm-1.8.48/java/Makefile.am	2006-04-20 21:32:07.000000000 +0200
 @@ -0,0 +1,33 @@
 +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 \
@@ -419,8 +655,8 @@
 +
 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-17 15:40:46.000000000 +0200
-@@ -1,19 +1,14 @@
++++ n.qdbm-1.8.48/java/configure.in	2006-04-20 21:37:18.000000000 +0200
+@@ -1,19 +1,12 @@
  # Source of configuration for Java interface of QDBM
  
 -
@@ -431,11 +667,8 @@
 -
 -
 -# Targets
--AC_INIT(qdbm-java, 1.0.0)
-+#AC_INIT(qdbm-java, 1.0.0)
-+AC_INIT([Makefile.am])
-+AM_INIT_AUTOMAKE(qdbm-java, 1.0.0)
-+#AC_CONFIG_HEADER([config.h])
+ AC_INIT(qdbm-java, 1.0.0)
++AM_INIT_AUTOMAKE([])
  
  # Export variables
  LIBVER=1
@@ -445,7 +678,7 @@
  MYJAVAHOME="/usr/java"
  JVMPLATFORM="linux"
  JAVAC="javac"
-@@ -22,46 +17,13 @@
+@@ -22,46 +15,13 @@
  JAVADOC="javadoc"
  JAVARUN="java"
  MYDEFS=""
@@ -493,7 +726,7 @@
  #================================================================
  # Checking Commands to Build with
  #================================================================
-@@ -183,29 +145,6 @@
+@@ -183,29 +143,6 @@
  AC_CHECK_LIB(bz2, main)
  AC_CHECK_LIB(iconv, main)
  
@@ -523,7 +756,7 @@
  #================================================================
  # Generic Settings
  #================================================================
-@@ -222,7 +161,7 @@
+@@ -222,7 +159,7 @@
  # Export variables
  AC_SUBST(LIBVER)
  AC_SUBST(LIBREV)
@@ -532,7 +765,7 @@
  AC_SUBST(MYJAVAHOME)
  AC_SUBST(JVMPLATFORM)
  AC_SUBST(JAVAC)
-@@ -231,11 +170,8 @@
+@@ -231,11 +168,8 @@
  AC_SUBST(JAVADOC)
  AC_SUBST(JAVARUN)
  AC_SUBST(MYDEFS)
@@ -544,9 +777,190 @@
 -
 -
  # END OF FILE
+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~	1970-01-01 01:00:00.000000000 +0100
++++ n.qdbm-1.8.48/java/configure.in~	2006-04-20 21:32:07.000000000 +0200
+@@ -0,0 +1,177 @@
++# Source of configuration for Java interface of QDBM
++
++#AC_INIT(qdbm-java, 1.0.0)
++AC_INIT([Makefile.am])
++AM_INIT_AUTOMAKE(qdbm-java, 1.0.0)
++#AC_CONFIG_HEADER([config.h])
++
++# Export variables
++LIBVER=1
++LIBREV=0
++LIBAGE=0
++MYJAVAHOME="/usr/java"
++JVMPLATFORM="linux"
++JAVAC="javac"
++JAR="jar"
++JAVAH="javah"
++JAVADOC="javadoc"
++JAVARUN="java"
++MYDEFS=""
++
++AC_PROG_LIBTOOL
++
++# Enable gcj
++AC_ARG_WITH(gcj,
++  AC_HELP_STRING([--with-gcj], [build with gcj, gcc for Java]))
++
++#================================================================
++# Checking Commands to Build with
++#================================================================
++
++
++# Home directory of Java
++printf 'checking MYJAVAHOME... '
++if test -d "$JAVA_HOME"
++then
++  MYJAVAHOME="$JAVA_HOME"
++fi
++printf '%s\n' "$MYJAVAHOME"
++
++# Platform of Java
++printf 'checking JVMPLATFORM... '
++if uname | grep Darwin > /dev/null
++then
++  JVMPLATFORM="mac"
++else
++  for file in `\ls $MYJAVAHOME/include`
++  do
++    if test -d "$MYJAVAHOME/include/$file"
++    then
++      JVMPLATFORM="$file"
++    fi
++  done
++fi
++printf '%s\n' "$JVMPLATFORM"
++
++# Java compiler
++printf 'checking JAVAC... '
++JAVAC="$MYJAVAHOME/bin/javac"
++if uname | grep Darwin > /dev/null
++then
++  if test -x "$MYJAVAHOME/Commands/javac"
++  then
++    JAVAC="$MYJAVAHOME/Commands/javac"
++  else
++    JAVAC="$MYJAVAHOME/bin/javac"
++  fi
++fi
++if test "$with_gcj" = "yes"
++then
++  JAVAC="gcj -C -Wall"
++  printf 'gcj -C -Wall\n'
++elif test -x "$JAVAC"
++then
++  printf '%s\n' "$JAVAC"
++else
++  printf 'no\n'
++  printf '#================================================================\n' 1>&2
++  printf '# WARNING: %s is not found.\n' "$JAVAC" 1>&2
++  printf '#================================================================\n' 1>&2
++fi
++
++# Other building tools
++if test "$with_gcj" = "yes"
++then
++  JAR="jar"
++  JAVAH="gcjh"
++  JAVADOC="false"
++  JAVARUN="gij"
++elif uname | grep Darwin > /dev/null
++then
++  if test -x "$MYJAVAHOME/Commands/java"
++  then
++    JAR="$MYJAVAHOME/Commands/jar"
++    JAVAH="$MYJAVAHOME/Commands/javah"
++    JAVADOC="$MYJAVAHOME/Commands/javadoc"
++    JAVARUN="$MYJAVAHOME/Commands/java"
++  else
++    JAR="$MYJAVAHOME/bin/jar"
++    JAVAH="$MYJAVAHOME/bin/javah"
++    JAVADOC="$MYJAVAHOME/bin/javadoc"
++    JAVARUN="$MYJAVAHOME/bin/java"
++  fi
++else
++  JAR="$MYJAVAHOME/bin/jar"
++  JAVAH="$MYJAVAHOME/bin/javah"
++  JAVADOC="$MYJAVAHOME/bin/javadoc"
++  JAVARUN="$MYJAVAHOME/bin/java"
++fi
++
++# C compiler
++AC_PROG_CC
++if test "$GCC" != "yes"
++then
++  printf '#================================================================\n' 1>&2
++  printf '# WARNING: GCC is required to build this package.\n' 1>&2
++  printf '#================================================================\n' 1>&2
++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'
++  printf '#================================================================\n' 1>&2
++  printf '# WARNING: ld is not found in PATH.\n' 1>&2
++  printf '#================================================================\n' 1>&2
++fi
++
++
++
++#================================================================
++# Checking Libraries
++#================================================================
++
++
++# 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)
++
++#================================================================
++# Generic Settings
++#================================================================
<<Diff was trimmed, longer than 597 lines>>

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

More information about the pld-cvs-commit mailing list