$NetBSD: patch-aa,v 1.11 2004/09/01 14:42:59 jmmv Exp $

--- configure.orig	2004-08-18 22:09:11.000000000 +0200
+++ configure
@@ -21231,7 +21231,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
+#include <sys/socket.h>
 int
 main ()
 {
@@ -21594,13 +21595,13 @@ echo "${ECHO_T}yes" >&6
 
             echo "$as_me:$LINENO: checking DAEMON_CFLAGS" >&5
 echo $ECHO_N "checking DAEMON_CFLAGS... $ECHO_C" >&6
-            DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED"`
+            DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0"`
             echo "$as_me:$LINENO: result: $DAEMON_CFLAGS" >&5
 echo "${ECHO_T}$DAEMON_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking DAEMON_LIBS" >&5
 echo $ECHO_N "checking DAEMON_LIBS... $ECHO_C" >&6
-            DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED"`
+            DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0"`
             echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
 echo "${ECHO_T}$DAEMON_LIBS" >&6
         else
@@ -28163,6 +28164,10 @@ else
    X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
    X_CONFIG_OPTIONS="-audit 0"
 fi
+X_PATH="${X11BASE}/bin"
+X_SERVER_PATH="${X11BASE}/bin"
+X_SERVER="${X11BASE}/bin/X ${X_SERVER_ARGS}"
+X_CONF_PATH="${X11BASE}/bin"
 
 
 
@@ -28218,6 +28223,8 @@ prefix=$old_prefix
 exec_prefix=$old_exec_prefix
 
                                                                                                                                                                                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"
+# This is to avoid GNU make; may not be needed on a later version..
+ac_config_files="$ac_config_files config/default.desktop config/gnome.desktop config/CDE.desktop"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
