blob: 5e241c979f0c695d679cdf1671e716a562741160 (
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
|
$NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $
--- configure.orig 2005-03-07 22:04:33.000000000 +0100
+++ configure
@@ -21643,7 +21643,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 ()
{
@@ -22113,13 +22114,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
@@ -29017,6 +29018,11 @@ else
X_CONFIG_OPTIONS="-audit 0"
fi
+X_PATH="${X11BASE}/bin"
+X_SERVER_PATH="${X11BASE}/bin"
+X_SERVER="${X11BASE}/bin/X ${X_SERVER_ARGS}"
+GDM_CONF_PATH="${X11BASE}/bin:${PREFIX}/bin:/usr/bin:/bin"
+
# Don't add EXPANDED_BINDIR to GDM_USER_PATH if it is already in the PATH.
if test "x$EXPANDED_BINDIR" != "x/bin" -a "x$EXPANDED_BINDIR" != "x/usr/bin"; then
GDM_USER_PATH="$GDM_USER_PATH:$EXPANDED_BINDIR"
@@ -29117,6 +29123,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
|
