- started update to 2.4.0

[packages/inn.git] / inn-ac25x.patch

diff --git a/inn-ac25x.patch b/inn-ac25x.patch
index 55279939e78ebe4129b0640b427e56ec9820a414..83a2e1b88d9ba9ac2d6aeab8ab4c9759fee8fad3 100644 (file)
--- a/inn-ac25x.patch
+++ b/inn-ac25x.patch
@@ -1,59 +1,16 @@
---- inn-2.3.2/configure.in.orig        Tue Sep 11 21:44:00 2001
-+++ inn-2.3.2/configure.in     Tue Sep 11 21:56:49 2001
-@@ -425,7 +425,7 @@
-                 case $i in
-                 inria)
-                         dnl http://www.kame.net/
--                        AC_EGREP_CPP(%%%yes%%%, [dnl
-+                        AC_EGREP_CPP(%%%yes%%%, [
- #include <netinet/in.h>
- #ifdef IPV6_INRIA_VERSION
- %%%yes%%%
-@@ -435,7 +435,7 @@
-                         ;;
-                 kame)
-                       dnl http://www.kame.net/
--                        AC_EGREP_CPP(%%%yes%%%, [dnl
-+                        AC_EGREP_CPP(%%%yes%%%, [
- #include <netinet/in.h>
- #ifdef __KAME__
- %%%yes%%%
-@@ -445,7 +445,7 @@
-                         ;;
-                 linux-glibc)
-                         dnl http://www.v6.linux.or.jp/
--                        AC_EGREP_CPP(%%%yes%%%, [dnl
-+                        AC_EGREP_CPP(%%%yes%%%, [
- #include <features.h>
- #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
- %%%yes%%%
-@@ -463,7 +463,7 @@
-                         fi
-                         ;;
-                 toshiba)
--                        AC_EGREP_CPP(%%%yes%%%, [dnl
-+                        AC_EGREP_CPP(%%%yes%%%, [
- #include <sys/param.h>
- #ifdef _TOSHIBA_INET6
- %%%yes%%%
-@@ -474,7 +474,7 @@
-                                 CFLAGS="-DINET6 $CFLAGS"])
-                         ;;
-                 v6d)
--                        AC_EGREP_CPP(%%%yes%%%, [dnl
-+                        AC_EGREP_CPP(%%%yes%%%, [
- #include </usr/local/v6/include/sys/v6config.h>
- #ifdef __V6D__
- %%%yes%%%
-@@ -485,7 +485,7 @@
-                               CFLAGS="-I/usr/local/v6/include $CFLAGS"])
-                         ;;
-                 zeta)
--                        AC_EGREP_CPP(%%%yes%%%, [dnl
-+                        AC_EGREP_CPP(%%%yes%%%, [
- #include <sys/param.h>
- #ifdef _ZETA_MINAMI_INET6
- yes
+--- inn-2.4.0/configure.in.orig        Tue Sep 11 21:44:00 2001
++++ inn-2.4.0/configure.in     Tue Sep 11 21:56:49 2001
+@@ -45,8 +45,8 @@
+ 
+ dnl Linking against in-tree libraries need to know the current directory (the
+ dnl top of the build directory, not the source directory).
+-builddir=`pwd`
+-AC_SUBST(builddir)
++abs_builddir=`pwd`
++AC_SUBST(abs_builddir)
+ 
+ dnl Earlier versions of INN used --with-largefiles, which was the wrong flag
+ dnl from the perspective of what --with and --enable are supposed to mean.
 @@ -1206,8 +1206,8 @@
  else
      ifelse([$5], , :, [$5])
@@ -64,19 +21,15 @@
 +ifdef([AC_TYPE_NAME],[undefine([AC_CV_NAME])])dnl
  ])
  
- dnl Find a 32 bit type, by trying likely candidates.  First, check for the
-@@ -1270,11 +1270,11 @@
+ dnl Find a 32 bit type, by trying likely candidates.  First, check for the C9X
+--- inn-2.4.0/Makefile.global.in.orig  2003-06-29 13:29:30.000000000 +0200
++++ inn-2.4.0/Makefile.global.in       2003-06-29 13:38:39.000000000 +0200
+@@ -33,7 +33,7 @@
+ ##  libraries built as part of INN.  Using relative paths confuses libtool
+ ##  when linking the test suite.
  
- dnl If we don't have fcntl, try to find another locking function.
- if test x"$ac_cv_func_fcntl" = xno ; then
--    AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK),
--        AC_CHECK_LIB(bsd, flock, 
-+    AC_CHECK_FUNC(flock, [AC_DEFINE(HAVE_FLOCK)],
-+        [AC_CHECK_LIB(bsd, flock, 
-                      AC_DEFINE(HAVE_FLOCK)
-                      LIBS="-lbsd $LIBS",
--                     [AC_CHECK_FUNCS(lockf)]))
-+                     [AC_CHECK_FUNCS(lockf)])])
- fi
+-builddir      = @builddir@
++builddir      = @abs_builddir@
  
- dnl If we don't have statvfs, gather some more information for inndf.
+ ##  Basic compiler settings.  COPT is the variable to override on the make
+ ##  command line to change the optimization or add warning flags (such as