84 lines
3.8 KiB
Text
84 lines
3.8 KiB
Text
$NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $
|
|
|
|
--- configure.orig 2008-05-13 02:27:18.000000000 +0200
|
|
+++ configure
|
|
@@ -27278,7 +27278,9 @@ cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
#include <sys/statvfs.h>
|
|
+#ifndef __NetBSD__
|
|
#include <sys/fstyp.h>
|
|
+#endif
|
|
_ACEOF
|
|
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
case "(($ac_try" in
|
|
@@ -33554,6 +33556,18 @@ case "$host" in
|
|
HOST_UTMP_LINE_REMOTE=""
|
|
HOST_UTMP_PSEUDO_DEVICE="false"
|
|
;;
|
|
+*netbsd*)
|
|
+ HOST_GDM_USER_PATH="/bin:/usr/bin"
|
|
+ HOST_HALT_COMMAND="/sbin/shutdown -p now"
|
|
+ HOST_REBOOT_COMMAND="/sbin/shutdown -r now"
|
|
+ HOST_SUSPEND_COMMAND="/usr/sbin/zzz"
|
|
+ HOST_XSESSION_SHELL=/bin/sh
|
|
+ HOST_SOUND_PROGRAM=/usr/bin/audioplay
|
|
+ HOST_GDMGNOMESESSIONCMD="dbus-launch --exit-with-session gnome-session"
|
|
+ HOST_UTMP_LINE_ATTACHED="/dev/console"
|
|
+ HOST_UTMP_LINE_REMOTE=""
|
|
+ HOST_UTMP_PSEUDO_DEVICE="false"
|
|
+ ;;
|
|
*)
|
|
HOST_GDM_USER_PATH="/bin:/usr/bin"
|
|
HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
|
|
@@ -33570,18 +33584,18 @@ esac
|
|
|
|
# allow user to override the host-specific default
|
|
|
|
-test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
|
|
-test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
|
|
-test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
|
|
-test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
|
|
-test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
|
|
-test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
|
|
-test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
|
|
-test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
|
|
-test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
|
|
-test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
|
|
-test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
|
|
-test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
|
|
+test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
|
|
+test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
|
|
+test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
|
|
+test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
|
|
+test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
|
|
+test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
|
|
+test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
|
|
+test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
|
|
+test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
|
|
+test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
|
|
+test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
|
|
+test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
|
|
|
|
# On Solaris, the /usr/bin/Xserver script is used to decide whether to
|
|
# use Xsun or Xorg, so this is used on Solaris.
|
|
@@ -33654,6 +33668,11 @@ elif test -x /usr/bin/X; then
|
|
X_SERVER_PATH="/usr/bin"
|
|
X_SERVER="/usr/bin/X"
|
|
X_CONFIG_OPTIONS="-audit 0"
|
|
+elif test -x ${X11BASE}/bin/X; then
|
|
+ X_PATH="${X11BASE}/bin"
|
|
+ X_SERVER_PATH="${X11BASE}/bin"
|
|
+ X_SERVER="${X11BASE}/bin/X"
|
|
+ X_CONFIG_OPTIONS="-audit 0"
|
|
else
|
|
# what to do, what to do, this is wrong, but this just sets the
|
|
# defaults, perhaps this user is cross compiling or some such
|
|
@@ -33663,6 +33682,7 @@ else
|
|
GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
|
|
X_CONFIG_OPTIONS="-audit 0"
|
|
fi
|
|
+X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS"
|
|
|
|
# Use Xephyr if it is available. It works better than Xnest since Xephyr
|
|
# supports the Xserver extensions, even if on a remote machine.
|