summaryrefslogtreecommitdiff
path: root/x11/gdm/patches/patch-aa
blob: 19bc1bc6ee70b703da118b528db7369f2eb71e41 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
$NetBSD: patch-aa,v 1.8 2004/05/17 01:17:46 danw Exp $

--- configure.orig	Sun Apr 11 21:53:01 2004
+++ configure
@@ -21237,7 +21237,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 ()
 {
@@ -21606,13 +21607,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
@@ -24803,6 +24804,7 @@ VRFY="verify-crypt"
 if test x$enable_authentication_scheme != xcrypt -a \
 	x$enable_authentication_scheme != xshadow ; then
 
+if [ "${USE_PAM}" = "yes" ]; then
 for ac_header in security/pam_appl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -24960,6 +24962,7 @@ fi
 done
 
 fi
+fi
 
 GDMASKPASS=
 EXTRA_GDMASKPASS_LIBS=
@@ -28015,6 +28018,10 @@ else
    X_SERVER="/usr/X11R6/bin/X"
    X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
 fi
+X_PATH="${X11BASE}/bin"
+X_SERVER_PATH="${X11BASE}/bin"
+X_SERVER="${X11BASE}/bin/X ${X_SERVER_ARGS}"
+X_CONF_PATH="${X11BASE}/bin"
 
 
 
@@ -28064,6 +28071,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 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