X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=edb-ac_fix.patch;h=a1187fc1fa05b6f6777f009ad2857e68b164ae91;hb=8d38bcaa7ec303dff6d89c754546c2157f130df9;hp=1c652e3b6fd20e2f2c78159ee460612fb32e01ee;hpb=2bb1e6c7e9338700b613dc6ad8fb2b8713c5c915;p=packages%2Fedb.git

diff --git a/edb-ac_fix.patch b/edb-ac_fix.patch
index 1c652e3..a1187fc 100644
--- a/edb-ac_fix.patch
+++ b/edb-ac_fix.patch
@@ -1,97 +1,80 @@
---- edb-1.0.2/configure.in.wiget	Mon Oct 23 20:44:55 2000
-+++ edb-1.0.2/configure.in	Fri Aug  9 17:58:08 2002
-@@ -1,5 +1,6 @@
--AC_INIT(src/Edb.h)
--AM_CONFIG_HEADER(config.h)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/Edb.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE(edb, 1.0.2)
- AC_PROG_CC
- AM_PROG_CC_STDC
-@@ -74,7 +75,6 @@
- 		CXXFLAGS="-fhandle-exceptions $CXXFLAGS"
- 	fi
- 
--	LIBOBJS="$LIBOBJS \$(COBJS)"
- fi
+--- edb-1.0.5/configure.in.orig	2004-07-13 06:02:42.000000000 +0200
++++ edb-1.0.5/configure.in	2004-10-27 23:52:20.952292416 +0200
+@@ -24,55 +24,6 @@
+ dnl AC_PROG_INSTALL()
+ dnl AC_ARG_PROGRAM()
  
+-dnl This is where we handle stuff that autoconf can't handle: compiler,
+-dnl preprocessor and load flags, libraries that the standard tests don't
+-dnl look for.  The default optimization is -O.
+-dnl
+-dnl XXX
+-dnl Don't override anything if it's already set from the environment.
+-AC_SUBST(CFLAGS)
+-AC_SUBST(CPPFLAGS)
+-dnl AC_SUBST(CXX)
+-dnl AC_SUBST(CXXFLAGS)
+-AC_SUBST(LDFLAGS)
+-case "$host_os" in
+-aix4.1*)   CFLAGS=${CFLAGS-"-O3"};;
+-bsd4.4)    CFLAGS=${CFLAGS-"-O2"};;
+-bsdi4*)	   CFLAGS=${CFLAGS-"-O2"};;
+-bsdi*)	   CC=${CC-"shlicc2"}
+-	   CFLAGS=${CFLAGS-"-O2"}
+-	   LIBS="-lipc $LIBS";;
+-irix*)	   CFLAGS=${CFLAGS-"-O2"};;
+-nextstep3) CFLAGS=${CFLAGS-"-O2"};;
+-linux*)	   CFLAGS=${CFLAGS-"-O2"};;
+-mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
+-	   LIBS="-lsocket -lsvipc $LIBS";;
+-sco*)	   CFLAGS="$CFLAGS -b elf"
+-	   LIBS="-lsocket -lnsl $LIBS";;
+-*)	   CFLAGS=${CFLAGS-"-O"};;
+-esac
+-CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
+-
+-dnl Optional C++ API..
+-dnl
+-dnl XXX
+-dnl Versions of GCC up to 2.8.0 required -fhandle-exceptions, but it is
+-dnl the default in versions 2.8.0 and after.
+-dnl AC_MSG_CHECKING(if --enable-cxx option specified)
+-dnl AC_ARG_ENABLE(cxx,
+-dnl	[  --enable-cxx            Provide C++ interfaces.],
+-dnl	[db_cv_cxx="$enable_cxx"], [db_cv_cxx="no"])
+-dnl AC_MSG_RESULT($db_cv_cxx)
+-dnl if test "$db_cv_cxx" = "yes"; then
+-dnl	AC_PROG_CXX
+-
+-dnl	if test "$GXX" = "yes"; then
+-dnl		CXXFLAGS="-fhandle-exceptions $CXXFLAGS"
+-dnl	fi
+-
+-dnl	AC_LIBOBJ="$AC_LIBOBJ \$(COBJS)"
+-dnl fi
+-
  dnl There are additional libraries we need for some compiler/architecture
-@@ -88,7 +88,7 @@
- 	[db_cv_compat185="$enable_compat185"], [db_cv_compat185="no"])
- AC_MSG_RESULT($db_cv_compat185)
- if test "$db_cv_compat185" = "yes"; then
--	LIBOBJS="db185.o $LIBOBJS"
-+	AC_LIBOBJ([db185])
- fi
- 
- dnl Optional utilities.
-@@ -137,7 +137,15 @@
- AC_CHECK_TYPE(ssize_t, int)
- AC_C_BIGENDIAN
- AC_C_CONST
--AC_STRUCT_ST_BLKSIZE
-+AC_DIAGNOSE([obsolete],[AC_STRUCT_ST_BLKSIZE:
-+        your code should no longer depend upon `HAVE_ST_BLKSIZE', but
-+        `HAVE_STRUCT_STAT_ST_BLKSIZE'.  Remove this warning and
-+        the `AC_DEFINE' when you adjust the code.])
-+AC_CHECK_MEMBERS([struct stat.st_blksize],[AC_DEFINE(HAVE_ST_BLKSIZE, 1,
-+                            [Define to 1 if your `struct stat' has
-+                             `st_blksize'.  Deprecated, use
-+                             `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])])
-+
- AC_HEADER_STAT
- AC_TYPE_MODE_T
- AC_TYPE_OFF_T
-@@ -163,7 +171,9 @@
- 
- dnl A/UX has a broken getopt(3).
- case "$host_os" in
--aux*)	LIBOBJS="getopt.o $LIBOBJS";;
-+aux*)	
-+AC_LIBOBJ([getopt])
-+;;
- esac
- 
- dnl Checks for system functions for which we don't have replacements.
-@@ -453,7 +463,8 @@
- 	AC_DEFINE(HAVE_ASSEM_UTS4_CC)
- 	mutex_align="sizeof(int)"
- 	spin_line1="typedef int tsl_t;"
--	LIBOBJS="$LIBOBJS uts4.cc.o";;
-+	AC_LIBOBJ([uts4.cc])
-+	;;
- x86/gcc)
- 	AC_DEFINE(HAVE_ASSEM_X86_GCC)
- 	mutex_align="1"
-@@ -647,15 +658,15 @@
- fi
- AC_MSG_RESULT($gtk_ok)
- 
--AC_CHECK_LIB(ncurses, putwin,
--  AC_CHECK_HEADER(ncurses.h, ncurses_ok=yes, ncurses_ok=no),
-+AC_CHECK_LIB(ncurses, putwin,[
-+  AC_CHECK_HEADER(ncurses.h, ncurses_ok=yes, ncurses_ok=no)],
-   ncurses_ok=no,
-   -lncurses)
-   
- AM_CONDITIONAL(EDB_VT_ED, test "$ncurses_ok" = yes)
- AM_CONDITIONAL(EDB_GTK_ED, test "$gtk_ok" = yes)
- 
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- Makefile
- src/Makefile
- tools/Makefile
-@@ -663,7 +674,8 @@
- src/db.h
- src/db_int.h
- src/db_185.h
+ dnl combinations.
+ AC_SUBST(LIBS)
+@@ -450,7 +401,6 @@
+ src/edb_int.h
+ src/edb_185.h
+ debian/Makefile
 -edb-config],
 -[
-+edb-config])
-+AC_CONFIG_COMMANDS([default],[[
- chmod +x edb-config
+-chmod +x edb-config
 -])
-+]],[[]])
-+AC_OUTPUT
++edb-config])
++AC_CONFIG_COMMANDS([default],
++	[chmod +x edb-config])
+--- edb-1.0.5/src/os_stat.c.orig	2001-04-05 18:31:35.000000000 +0200
++++ edb-1.0.5/src/os_stat.c	2004-10-27 23:52:51.401663408 +0200
+@@ -88,7 +88,7 @@
+ 	 * Check for a 0 size -- the HP MPE/iX architecture has st_blksize,
+ 	 * but it's always 0.
+ 	 */
+-#ifdef HAVE_ST_BLKSIZE
++#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
+ 	if (iosizep != NULL && (*iosizep = sb.st_blksize) == 0)
+ 		*iosizep = DB_DEF_IOSIZE;
+ #else