*** empty log message ***

diff --git a/Changes b/Changes
index e67144587e9558361319569b2ec8b108fb46e554..389c7e9d98639d757f4006e71207f8b01ee0edc2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -27,6 +27,7 @@ TODO: align default value of cutchars with rxvt.1.pod and add it as a fallback i
        - fix a serious bug while setting the XIM destroy callback
           on (typical) 64 bit systems.
        - fix memory leak in pixmap code.
+        - do not link rxvtc against every lib on the planet anymore.
 
 8.4  Sat Oct 27 14:02:13 CEST 2007
        - overhaul of the transparency/pixmap code (sasha).

diff --git a/config.h.in b/config.h.in
index 77ed00fb6a464bfdfe4f47b75e2953f6ebf1989e..c17272b8d7de2b78bb0bce9a5c50239c28b75c54 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -112,6 +112,12 @@
 /* Define to 1 if you have the `openpty' function. */
 #undef HAVE_OPENPTY
 
+/* Define to 1 if you have the `port_create' function. */
+#undef HAVE_PORT_CREATE
+
+/* Define to 1 if you have the <port.h> header file. */
+#undef HAVE_PORT_H
+
 /* Define to 1 if you have the `posix_openpt' function. */
 #undef HAVE_POSIX_OPENPT
 

diff --git a/configure b/configure
index 2da362554776afac9e9926d27b25656ca7d6aa7b..066703b3808f4c6d5015ff401ca93fd65f1c60c5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1922,6 +1922,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+
 echo ""
 echo "configuring for rxvt $VERSION"
 echo ""
@@ -5367,7 +5368,8 @@ done
 
 
 
-for ac_header in sys/epoll.h sys/event.h sys/queue.h
+
+for ac_header in sys/epoll.h sys/event.h sys/queue.h port.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -5509,7 +5511,8 @@ done
 
 
 
-for ac_func in epoll_ctl kqueue
+
+for ac_func in epoll_ctl kqueue port_create
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -12973,7 +12976,7 @@ fi
 
 
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
-    LIBS="$LIBS `$PKG_CONFIG xft --libs`"
+    X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
     CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
   else
     # Extract the first word of "xft-config", so it can be a program name with args.
@@ -13018,7 +13021,7 @@ fi
 
 
     if test $XFT_CONFIG != no; then
-      LIBS="$LIBS `$XFT_CONFIG --libs`"
+      X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
       CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
     fi
   fi
@@ -13165,6 +13168,8 @@ fi
 
 done
 
+  ac_save_LIBS="$LIBS"
+  LIBS="$LIBS $X_LIBS"
 
 { echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
 echo $ECHO_N "checking for XftDrawString32 in -lXft... $ECHO_C" >&6; }
@@ -13238,6 +13243,7 @@ else
   support_xft=no
 fi
 
+  LIBS="$ac_save_LIBS"
 
   if test x$support_xft = xyes; then
 

diff --git a/configure.ac b/configure.ac
index 58959f6bc7168f7332c9f4cbc4cc7a268cbd4e23..119a29012610f5014ba5e628ac34ab003afd2449 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ AC_SUBST(VERSION)dnl
 AC_SUBST(DATE)dnl
 AC_SUBST(LSMDATE)dnl
 AC_SUBST(LIBVERSION)dnl
+
 echo ""
 echo "configuring for rxvt $VERSION"
 echo ""
@@ -727,18 +728,21 @@ dnl# --------------------------------------------------------------------------
 if test x$support_xft = xyes; then
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
-    LIBS="$LIBS `$PKG_CONFIG xft --libs`"
+    X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
     CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
   else
     AC_PATH_PROG(XFT_CONFIG, xft-config, no)
     if test $XFT_CONFIG != no; then
-      LIBS="$LIBS `$XFT_CONFIG --libs`"
+      X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
       CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
     fi
   fi
 
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $X_LIBS"
   AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
-  AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
+  AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
+  LIBS="$save_LIBS"
 
   if test x$support_xft = xyes; then
     AC_DEFINE(XFT, 1, Define to enable xft support)