- up to 1.5.1

[packages/apr.git] / apr-link.patch

diff --git a/apr-link.patch b/apr-link.patch
index 10e01f6840e5d3895aee907ed6ff146223f02938..3db9bafc414579749c1b8a921d45fd487e69230b 100644 (file)
--- a/apr-link.patch
+++ b/apr-link.patch
@@ -1,40 +1,15 @@
---- apr/build/apr_threads.m4.orig      2003-10-05 21:35:45.000000000 +0200
-+++ apr/build/apr_threads.m4   2003-10-05 21:50:16.883264632 +0200
-@@ -130,6 +130,8 @@
- fi
- ])
- 
-+dnl -pthread in CFLAGS is not sufficient if linking in separate process
-+pthreads_working=
- AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
- ac_cv_pthreads_lib=""
- if test "$pthreads_working" != "yes"; then
---- apr/configure.in.orig      2003-09-02 12:19:46.000000000 +0200
-+++ apr/configure.in   2003-10-05 22:35:55.808884648 +0200
-@@ -189,7 +189,7 @@
- # On AIX, libraries need to be specified on the link of lib_target
- lib_target_libs=""
- case $host in
--    *aix*)
-+    *aix*|*linux*)
-         lib_target_libs="\$(EXTRA_LIBS)";
-         ;;
-     *-solaris2*)
-@@ -463,11 +463,9 @@
- dnl It should check for LIBS being empty and set LIBS equal to the new value 
- dnl without the extra " " in that case, but they didn't do that.  So, we
- dnl end up LIBS="-lm -lcrypt -lnsl  -ldl" which is an annoyance.
--AC_CHECK_LIB(resolv, res_init)
--AC_CHECK_LIB(nsl, gethostbyname)
-+dnl AC_CHECK_LIB(resolv, res_init)  -- not used by apr
- AC_SEARCH_LIBS(gethostname, nsl)
--AC_CHECK_LIB(socket, socket)
--AC_SEARCH_LIBS(crypt, crypt ufc)
-+AC_SEARCH_LIBS(socket, socket)
- AC_CHECK_LIB(truerand, main)
- AC_SEARCH_LIBS(modf, m)
- AC_SEARCH_LIBS(sqrt, m)
-@@ -604,7 +602,7 @@
+--- apr-1.3.0/configure.in.orig        2008-05-02 20:55:47.000000000 +0200
++++ apr-1.3.0/configure.in     2008-06-16 22:56:55.094888283 +0200
+@@ -600,7 +600,7 @@
+       AC_SEARCH_LIBS(gethostbyname, nsl)
+       AC_SEARCH_LIBS(gethostname, nsl)
+       AC_SEARCH_LIBS(socket, socket)
+-      AC_SEARCH_LIBS(crypt, crypt ufc)
++      dnl AC_SEARCH_LIBS(crypt, crypt ufc)
+       AC_CHECK_LIB(truerand, main)
+       AC_SEARCH_LIBS(modf, m)
+        ;;
+@@ -767,7 +767,7 @@
  
  # The real-time POSIX extensions (e.g. shm_*, sem_*) may only
  # be available if linking against librt.
@@ -43,17 +18,3 @@
  
  case $host in
   *-sysv*)
-@@ -863,10 +861,13 @@
- if test "$strerror_r" = "1"; then
-   APR_CHECK_STRERROR_R_RC
- fi
-+save_LIBS="$LIBS"
-+AC_SEARCH_LIBS(crypt, crypt ufc)
- AC_CHECK_FUNCS(crypt_r, [ crypt_r="1" ], [ crypt_r="0" ])
- if test "$crypt_r" = "1"; then
-   APR_CHECK_CRYPT_R_STYLE
- fi
-+LIBS="$save_LIBS"
- AC_CHECK_FUNCS(mmap, [ mmap="1" ], [ mmap="0" ])
- if test "$native_mmap_emul" = "1"; then
-     mmap="1"