diff options
Diffstat (limited to 'x11/gdm/patches/patch-aa')
| -rw-r--r-- | x11/gdm/patches/patch-aa | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa index 69453551cff..5e241c979f0 100644 --- a/x11/gdm/patches/patch-aa +++ b/x11/gdm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $ +$NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $ ---- configure.orig 2004-10-27 01:06:14.000000000 +0200 +--- configure.orig 2005-03-07 22:04:33.000000000 +0100 +++ configure -@@ -21231,7 +21231,8 @@ _ACEOF +@@ -21643,7 +21643,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $ int main () { -@@ -21594,13 +21595,13 @@ echo "${ECHO_T}yes" >&6 +@@ -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 @@ -28,19 +28,19 @@ $NetBSD: patch-aa,v 1.12 2004/12/28 21:51:12 jmmv Exp $ echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5 echo "${ECHO_T}$DAEMON_LIBS" >&6 else -@@ -28158,6 +28159,11 @@ 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}" -+X_CONF_PATH="${X11BASE}/bin" ++GDM_CONF_PATH="${X11BASE}/bin:${PREFIX}/bin:/usr/bin:/bin" + - # On Solaris, Xnest is only shipped in /usr/openwin/, so set path - # properly. The Xsun version of Xnest also requires the -pn - # argument so it can be run as the user. Note that you can have -@@ -28233,6 +28239,8 @@ prefix=$old_prefix + # 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" |