This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2005-12-26 16:33:46 UTC Jakub Bogusz <qboosh@pld-linux.org> '- added link patch to kill unnecessary -lnsl'
Cherrypick from master 2006-03-09 13:06:39 UTC Paweł Sikora <pluto@pld-linux.org> '- fix -lXpm detection.':
    urxvt-link.patch -> 1.5

diff --git a/urxvt-link.patch b/urxvt-link.patch
index 39e9c3f17581227ef2d2eb7a6f4dc899718f3a5c..8ef4d8d5fdd8d34c6541896b6b89f6d8f9acd7f6 100644 (file)
--- a/urxvt-link.patch
+++ b/urxvt-link.patch
@@ -1,16 +1,28 @@
---- rxvt-unicode-5.9/autoconf/configure.in.orig        2005-12-26 15:43:00.804801000 +0100
-+++ rxvt-unicode-5.9/autoconf/configure.in     2005-12-26 17:01:55.905956440 +0100
-@@ -77,11 +77,11 @@
- AC_ISC_POSIX
+--- rxvt-unicode-7.7/aclocal.m4.orig   2006-01-22 01:48:13.000000000 +0100
++++ rxvt-unicode-7.7/aclocal.m4        2006-03-09 14:05:56.048362500 +0100
+@@ -176,7 +176,7 @@
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS="$LIBS"
+   LIBS="$LIBS $X_LIBS -lXpm -lX11"
+-AC_TRY_LINK(, [XpmReadFileToPixmap()],
++AC_TRY_LINK([#include <X11/xpm.h>], [XpmReadFileToPixmap(0, 0, 0, 0, 0, 0);],
+ [LIBS="$ac_save_LIBS"
+ # We can link libXpm with no special library path.
+ vt_xpm_libraries=],
+diff -aurN rxvt-unicode-7.5.orig/configure.ac rxvt-unicode-7.5/configure.ac
+--- rxvt-unicode-7.5.orig/configure.ac 2006-01-28 22:26:37.000000000 +0100
++++ rxvt-unicode-7.5/configure.ac      2006-02-04 20:46:00.617940000 +0100
+@@ -88,11 +88,11 @@
+ dnl fi
  
  dnl# FreeBSD needs to link libxpg4
--AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
+-AC_CHECK_FUNC(setlocale,     [], [AC_CHECK_LIB(xpg4,   setlocale,     [LIBS="$LIBS -lxpg4"])])
 +AC_SEARCH_LIBS(setlocale, xpg4)
  
- dnl solaris needs to link libnsl and socket
--AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
--AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
-+AC_SEARCH_LIBS(gethostbyname, nsl)
+ dnl# solaris needs to link libnsl and socket
+-AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl,    gethostbyname, [LIBS="$LIBS -lnsl"])])
+-AC_CHECK_FUNC(socket,        [], [AC_CHECK_LIB(socket, socket,        [LIBS="$LIBS -lsocket"])])
++AC_SEARCH_LIBS(nsl, gethostbyname)
 +AC_SEARCH_LIBS(socket, socket)
  
  dnl AC_ENABLE_SHARED(no)dnl#  libtool