SOURCES: qdbm-am_ac.patch - kill diff from vim backup files
twittner
twittner at pld-linux.org
Fri Apr 21 18:31:39 CEST 2006
Author: twittner Date: Fri Apr 21 16:31:39 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- kill diff from vim backup files
---- Files affected:
SOURCES:
qdbm-am_ac.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/qdbm-am_ac.patch
diff -u SOURCES/qdbm-am_ac.patch:1.2 SOURCES/qdbm-am_ac.patch:1.3
--- SOURCES/qdbm-am_ac.patch:1.2 Thu Apr 20 21:48:33 2006
+++ SOURCES/qdbm-am_ac.patch Fri Apr 21 18:31:34 2006
@@ -127,7 +127,7 @@
+
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:36:49.000000000 +0200
++++ n.qdbm-1.8.48/cgi/configure.in 2006-04-20 21:46:42.000000000 +0200
@@ -1,54 +1,12 @@
# Source of configuration for CGI scripts of QDBM
@@ -232,50 +232,6 @@
-
-
# 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-20 21:38:04.000000000 +0200
@@ -419,203 +375,6 @@
-
-
# 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-20 21:32:07.000000000 +0200
@@ -777,187 +536,6 @@
-
-
# 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
-+#================================================================
-+
-+# Data types
-+if uname | grep '^SunOS' > /dev/null
-+then
-+ MYDEFS='-Dint64_t=long\ long'
-+elif uname | grep '^CYGWIN' > /dev/null
-+then
-+ MYDEFS='-D__int64=long\ long'
-+fi
-+
-+# Export variables
-+AC_SUBST(LIBVER)
-+AC_SUBST(LIBREV)
-+AC_SUBST(LIBAGE)
-+AC_SUBST(MYJAVAHOME)
-+AC_SUBST(JVMPLATFORM)
-+AC_SUBST(JAVAC)
-+AC_SUBST(JAR)
-+AC_SUBST(JAVAH)
-+AC_SUBST(JAVADOC)
-+AC_SUBST(JAVARUN)
-+AC_SUBST(MYDEFS)
-+
-+# Targets
-+AC_OUTPUT(Makefile)
-+
-+# 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
@@ -1250,100 +828,6 @@
-
-
# END OF FILE
-diff -Nur o.qdbm-1.8.48/plus/configure.in~ n.qdbm-1.8.48/plus/configure.in~
---- o.qdbm-1.8.48/plus/configure.in~ 1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.48/plus/configure.in~ 2006-04-20 21:32:07.000000000 +0200
-@@ -0,0 +1,90 @@
-+# Source of configuration for C++ interface of QDBM
-+
-+# Targets
-+AC_INIT([Makefile.am])
-+AM_INIT_AUTOMAKE(qdbm-plus, 1.0.0, [])
-+#AC_CONFIG_HEADER([config.h])
-+
-+# Export variables
-+LIBVER=2
-+LIBREV=0
-+LIBAGE=0
-+
-+AC_PROG_LIBTOOL
-+
-+#================================================================
-+# Checking Commands to Build with
-+#================================================================
-+
-+
-+# C compiler
-+AC_PROG_CC
-+
-+# C++ compiler
-+AC_PROG_CXX
-+if test "$GXX" != "yes"
-+then
-+ printf '#================================================================\n' 1>&2
-+ printf '# WARNING: g++ (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
-+
-+# 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'
-+ printf '#================================================================\n' 1>&2
-+ printf '# WARNING: ar 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(rt, 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)
-+AC_CHECK_LIB(stdc++, main)
-+
-+
-+#================================================================
-+# Generic Settings
-+#================================================================
-+
-+
-+# Export variables
-+AC_SUBST(LIBVER)
-+AC_SUBST(LIBREV)
-+AC_SUBST(LIBAGE)
-+
-+# Targets
-+AC_OUTPUT(Makefile)
-+
-+# END OF FILE
diff -Nur o.qdbm-1.8.48/ruby/Makefile.in n.qdbm-1.8.48/ruby/Makefile.in
--- o.qdbm-1.8.48/ruby/Makefile.in 2006-04-17 15:40:45.000000000 +0200
+++ n.qdbm-1.8.48/ruby/Makefile.in 2006-04-20 21:32:07.000000000 +0200
@@ -1470,21 +954,6 @@
-
-
# END OF FILE
-diff -Nur o.qdbm-1.8.48/ruby/configure.in~ n.qdbm-1.8.48/ruby/configure.in~
---- o.qdbm-1.8.48/ruby/configure.in~ 1970-01-01 01:00:00.000000000 +0100
-+++ n.qdbm-1.8.48/ruby/configure.in~ 2006-04-20 21:32:07.000000000 +0200
-@@ -0,0 +1,11 @@
-+# Source of configuration for Ruby interface of QDBM
-+
-+AC_INIT(qdbm-ruby, 1.0.0)
-+#AC_INIT([Makefile.am])
-+#AM_AUTOMAKE_INIT(qdbm-ruby, 1.0.0, [])
-+#AC_CONFIG_HEADER([config.h])
-+
-+# Targets
-+AC_OUTPUT(Makefile)
-+
-+# END OF FILE
diff -Nur o.qdbm-1.8.48/ruby/curia/extconf.rb n.qdbm-1.8.48/ruby/curia/extconf.rb
--- o.qdbm-1.8.48/ruby/curia/extconf.rb 2006-04-17 15:40:45.000000000 +0200
+++ n.qdbm-1.8.48/ruby/curia/extconf.rb 2006-04-20 21:32:07.000000000 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/qdbm-am_ac.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list