summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@sun.com>2005-10-26 23:32:40 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-10-26 23:32:40 +0000
commitc48cf5e26d681533632e0674b9989c6dbea1ccbc (patch)
treefc829deac5f533f37ce1e53471e3ba231992cbaf
parent24554784576a189dea83b9c9d816c95583948e7d (diff)
downloadgdm-c48cf5e26d681533632e0674b9989c6dbea1ccbc.tar.gz
Bumping minor version to match GNOME release schedule. Updated. Renamed
2005-10-26 Brian Cameron <Brian.Cameron@sun.com> * Release 2.13.0.0: Bumping minor version to match GNOME release schedule. * NEWS, configure.ac, autogen.sh: Updated. Renamed configure.in to configure.ac.
-rw-r--r--ChangeLog17
-rw-r--r--NEWS51
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.in1158
4 files changed, 64 insertions, 1164 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dc5b611..642cb72d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-26 Brian Cameron <Brian.Cameron@sun.com>
+
+ * Release 2.13.0.0: Bumping minor version
+ to match GNOME release schedule.
+ * NEWS, configure.ac, autogen.sh: Updated.
+ Renamed configure.in to configure.ac.
+
2005-10-14 Brian Cameron <Brian.Cameron@sun.com>
* gui/gdmlogin.c: No longer set tooltips for menu
@@ -135,14 +142,14 @@
2005-09-22 Rodrigo Moya <rodrigo@novell.com>
* gui/gdmflexiserver.c (run_again): use gnome-screensaver if
- available instead of xscreensaver.
+ available instead of xscreensaver.
2005-09-22 Rodrigo Moya <rodrigo@novell.com>
* gui/gdmphotosetup.c: fixed compilation warnings.
- (add_preview_widget): made it static to avoid 'no previous prototype'
- warning.
- (browse_button_cb, fill_model): removed unused variables.
+ (add_preview_widget): made it static to avoid 'no previous prototype'
+ warning.
+ (browse_button_cb, fill_model): removed unused variables.
2005-09-20 Brian Cameron <Brian.Cameron@sun.com>
@@ -300,7 +307,7 @@
2005-08-17 Rodrigo Moya <rodrigo@novell.com>
* gui/greeter/greeter_system.c (greeter_system_handler): added
- missing tooltips.
+ missing tooltips.
2005-08-16 Brian Cameron <brian.cameron@sun.com>
diff --git a/NEWS b/NEWS
index ffddde38..493725de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,56 @@
Ahh news...
+2.13.0.0 stuff:
+
+- Fix problem with PostSession script not always being
+ executed when user kills the Xserver with
+ ctrl-alt-backspace. Fixes bug #152906.
+ (Jerry G. DeLapp)
+
+- No longer set tooltips for menu items in gdmlogin.
+ These do not work with accessibility and no GNOME
+ programs use menu tooltips, it is not recommended.
+ (Brian Cameron)
+
+- Change the way the "OK" and "Cancel" buttons work
+ so they are consistant. Now the "Cancel" button
+ in gdmlogin is active when the Username is requested
+ and just clears the field. This makes gdmlogin work
+ like gdmgreeter. Now make the buttons insensitive
+ when the ok/enter/tab is pressed and make them
+ sensitive again when the greeter wants entry. This
+ fixes a bug where the greeter's memory could get
+ corrupted by pressing "Cancel" after authentication
+ (which would only happen if the PostLogin script
+ caused a long enough delay to allow this to happen
+ or perhaps on a really slow machine). (Brian
+ Cameron)
+
+- Correct reading of config file in gdmflexiserver.
+ (Christiaan Welvaart)
+
+- GNOME HIG fixes for the Language, Session, and
+ Message dialogs. (Dennis Cranston)
+
+- Define SoundProgram to be /usr/bin/audioplay instead
+ of /usr/bin/play on Solaris. /usr/bin/play does not
+ exist on Solaris.
+
+- Better /etc/default/login support on Solaris. Previously
+ it supported only PASSREQ. Now it supports PATH, SUPATH
+ and CONSOLE (the same ones CDE login supports). Added
+ new PasswordRequired gdm.conf setting so that PASSREQ
+ can be controlled via gdm.conf as well.
+
+- Memory leaks fixed. (Steve Grubb/Brian Cameron)
+
+- Improvements to strings and docs (Adam Weinberger,
+ Brian Cameron)
+
+- Translation updates (Takeshi AIHANA, Runa Bhattacharjee,
+ Priit Laes, Chao-Hsiung Liao, Ignacio Casal Quinteiro,
+ Vincent van Adrighem, Funda Wang, Adam Weinberger)
+
2.8.0.5 stuff:
- gdmflexiserver supports --startnew option so that
diff --git a/autogen.sh b/autogen.sh
index 8e79b8cc..47d0ba63 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ if test ! -d $srcdir/vicious-extensions; then
exit 1
fi
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
&& test -d $srcdir/daemon \
&& test -f $srcdir/daemon/gdm.h) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.in b/configure.in
deleted file mode 100644
index ec2ac9ae..00000000
--- a/configure.in
+++ /dev/null
@@ -1,1158 +0,0 @@
-AC_PREREQ(2.52)
-AC_INIT(daemon/gdm.h)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.8.0.5)
-AC_CONFIG_MACRO_DIR([m4])
-AM_MAINTAINER_MODE
-
-AC_PROG_INTLTOOL([0.28])
-
-GNOME_DOC_INIT
-
-GLIB_REQUIRED=2.6.0
-GTK_REQUIRED=2.3.0
-PANGO_REQUIRED=1.3.0
-LIBGLADE_REQUIRED=1.99.2
-LIBGNOME_REQUIRED=1.96.0
-LIBGNOMEUI_REQUIRED=1.96.0
-LIBGNOMECANVAS_REQUIRED=1.109.0
-LIBRSVG_REQUIRED=1.1.1
-LIBXML_REQUIRED=2.4.12
-LIBART_REQUIRED=2.3.11
-SCROLLKEEPER_REQUIRED=0.1.4
-
-# find the actual value for $prefix that we'll end up with
-REAL_PREFIX=
-if test "x$prefix" = "xNONE"; then
- REAL_PREFIX=$ac_default_prefix
-else
- REAL_PREFIX=$prefix
-fi
-old_prefix=$prefix
-prefix=$REAL_PREFIX
-
-REAL_EXEC_PREFIX=
-if test "x$exec_prefix" = "xNONE"; then
- REAL_EXEC_PREFIX=$prefix
-else
- REAL_EXEC_PREFIX=$exec_prefix
-fi
-old_exec_prefix=$exec_prefix
-exec_prefix=$REAL_EXEC_PREFIX
-
-
-dnl
-dnl Configure arguments
-dnl
-AC_ARG_ENABLE(console-helper,
- [ --enable-console-helper=[auto/no/yes] Enable PAM console helper [default=auto]],,
- enable_console_helper=auto)
-
-AC_ARG_ENABLE(authentication-scheme,
- [ --enable-authentication-scheme=[auto/pam/crypt/shadow] Choose a specific
- authentication scheme [default=auto]],,
- enable_authentication_scheme=auto)
-
-AC_ARG_WITH(xinerama,
- [ --with-xinerama=[auto/yes/no] Add Xinerama support [default=auto]],,
- with_xinerama=auto)
-
-AC_ARG_WITH(xdmcp,
- [ --with-xdmcp=[auto/yes/no] Add XDMCP (remote login) support [default=auto]],,
- with_xdmcp=auto)
-
-AC_ARG_WITH(tcp-wrappers,
- [ --with-tcp-wrappers=[auto/yes/no] Use TCP Wrappers [default=auto]],,
- with_tcp_wrappers=auto)
-
-AC_ARG_WITH(dmx,
- [ --with-dmx=[auto/yes/no] Add DMX (Distributed Multihead X) support [default=auto]],,
- with_dmx=auto)
-
-AC_ARG_WITH(selinux, [ --with-selinux Add SELinux support])
-
-withval=""
-AC_ARG_WITH(post-path,
-[ --with-post-path=<PATH> add PATH to end of user's PATH when logging in],[
-if test x$withval != x; then
- AC_MSG_RESULT("PATH ${withval} with be added to end of user's PATH when logging in.")
-fi])
-if test x$withval != x; then
- USER_POST_PATH="$withval"
-fi
-
-dnl
-dnl PAM prefix
-dnl
-withval=""
-AC_ARG_WITH(pam-prefix,
-[ --with-pam-prefix=<prefix> specify where pam files go],[
-if test x$withval != x; then
- AC_MSG_RESULT("PAM files will be installed in prefix ${withval}.")
-fi])
-if test x$withval != x; then
- PAM_PREFIX_UNEXPANDED="$withval"
-else
- PAM_PREFIX_UNEXPANDED="$sysconfdir"
-fi
-PAM_PREFIX=`eval echo $PAM_PREFIX_UNEXPANDED`
-AC_SUBST(PAM_PREFIX)
-
-
-AC_PATH_PROG(CONSOLE_HELPER,consolehelper,no)
-if test "x$CONSOLE_HELPER" = "xno" ; then
- if test "x$enable_console_helper" = "xyes" ; then
- AC_MSG_ERROR(Console helper requested but consolehelper binary not found)
- fi
- # if it was no, nothing happens, if it was auto, well then we're out of luck
- enable_console_helper=no
-else
- if test ! "x$enable_console_helper" = "xno" ; then
- enable_console_helper=yes
- fi
-fi
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_STDC_HEADERS
-dnl AC_ARG_PROGRAM
-AM_PROG_LIBTOOL
-
-AC_PATH_XTRA
-AC_CHECK_TYPE(socklen_t,size_t)
-AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv])
-
-GNOME_COMPILE_WARNINGS
-CFLAGS="$CFLAGS $WARN_CFLAGS"
-
-PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED)
-AC_SUBST(VICIOUS_CFLAGS)
-AC_SUBST(VICIOUS_LIBS)
-
-PKG_CHECK_MODULES(DAEMON, gtk+-2.0 >= $GTK_REQUIRED)
-AC_SUBST(DAEMON_CFLAGS)
-AC_SUBST(DAEMON_LIBS)
-
-PKG_CHECK_MODULES(GUI, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
-AC_SUBST(GUI_CFLAGS)
-AC_SUBST(GUI_LIBS)
-
-PKG_CHECK_MODULES(GUIGLADE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
-AC_SUBST(GUIGLADE_CFLAGS)
-AC_SUBST(GUIGLADE_LIBS)
-
-PKG_CHECK_MODULES(GUING, gtk+-2.0 >= $GTK_REQUIRED)
-AC_SUBST(GUING_CFLAGS)
-AC_SUBST(GUING_LIBS)
-
-PKG_CHECK_MODULES(GREETER, gtk+-2.0 >= $GTK_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED libart-2.0 >= $LIBART_REQUIRED)
-AC_SUBST(GREETER_CFLAGS)
-AC_SUBST(GREETER_LIBS)
-
-PKG_CHECK_MODULES(UTILS, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
-AC_SUBST(UTILS_CFLAGS)
-AC_SUBST(UTILS_LIBS)
-
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(GOBJECT_CFLAGS)
-AC_SUBST(GOBJECT_LIBS)
-
-PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED)
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
-
-PKG_CHECK_MODULES(PANGOFT, pangoft2 >= $PANGO_REQUIRED)
-AC_SUBST(PANGOFT_CFLAGS)
-AC_SUBST(PANGOFT_LIBS)
-
-PKG_CHECK_MODULES(GDK, gdk-2.0 >= $GTK_REQUIRED)
-AC_SUBST(GDK_CFLAGS)
-AC_SUBST(GDK_LIBS)
-
-PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= $GTK_REQUIRED)
-AC_SUBST(GDKPIXBUF_CFLAGS)
-AC_SUBST(GDKPIXBUF_LIBS)
-
-PKG_CHECK_MODULES(LIBGNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED)
-AC_SUBST(LIBGNOME_CFLAGS)
-AC_SUBST(LIBGNOME_LIBS)
-
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
-AC_SUBST(LIBGNOMEUI_CFLAGS)
-AC_SUBST(LIBGNOMEUI_LIBS)
-
-dnl Allow users to run gdmsetup using the console helper PAM stuff.
-if test "x$enable_console_helper" = "xyes"; then
- AM_CONDITIONAL(CONSOLE_HELPER, true)
-else
- AM_CONDITIONAL(CONSOLE_HELPER, false)
-fi
-
-dnl ## Language Support
-GETTEXT_PACKAGE=gdm
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
-AC_SUBST(GETTEXT_PACKAGE)
-
-dnl ## internationalization support
-ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN zh_TW zu"
-AM_GLIB_GNU_GETTEXT
-
-EXTRA_DAEMON_LIBS=""
-EXTRA_CHOOSER_LIBS=""
-EXTRA_XNEST_LIBS=""
-EXTRA_FLEXI_LIBS=""
-EXTRA_DYNAMIC_LIBS=""
-EXTRA_SETUP_LIBS=""
-
-AC_CHECK_FUNC(socket,,[
- AC_CHECK_LIB(socket,socket, [
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket"
- EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"
- EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket"
- EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket"
- EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket"
- EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket"])])
-AC_CHECK_FUNC(gethostbyname,,[
- AC_CHECK_LIB(nsl,gethostbyname, [
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl"
- EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"])])
-AC_CHECK_FUNC(sched_yield,[
- AC_DEFINE(HAVE_SCHED_YIELD)],[
- AC_CHECK_LIB(rt,sched_yield, [
- AC_DEFINE(HAVE_SCHED_YIELD)
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lrt"], [
- echo "No sched_yield found"])])
-AC_CHECK_FUNC(inet_aton,,[
- AC_CHECK_LIB(resolv,inet_aton, [
- EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lresolv"])])
-
-VICIOUS_GNOME_LIBS="libviciousui.a libviciousui-gnome.a \
- libviciousui-minimal.a libvicious-gnome.a"
-AC_SUBST(VICIOUS_GNOME_LIBS)
-
-dnl *****************************
-dnl IPv6 specific checks
-dnl *****************************
-AC_MSG_CHECKING([whether to enable IPv6])
-AC_ARG_ENABLE(ipv6, [ --enable-ipv6=[yes/no] Enables compilation of IPv6 code default=[no]],, enable_ipv6=no)
-if test x$enable_ipv6 = xyes; then
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>],[
- struct sockaddr_storage ss;
- socket(AF_INET6, SOCK_STREAM, 0)
- ],
- have_ipv6=yes,
- have_ipv6=no
- )
- if test x$have_ipv6 = xyes; then
- have_getaddrinfo=no
- have_inet_ntop=no
- AC_CHECK_FUNC(getaddrinfo, have_getaddrinfo=yes)
- if test x$have_getaddrinfo != xyes; then
- for lib in bsd socket inet; do
- AC_CHECK_LIB($lib,getaddrinfo,["LIBS=$LIBS -l$lib";have_getaddrinfo=yes;break])
- done
- fi
-
- AC_CHECK_FUNC(inet_ntop,have_inet_ntop=yes)
- if test x$have_inet_ntop != xyes; then
- for lib in bsd nsl inet; do
- AC_CHECK_LIB($lib,inet_ntop,["LIBS=$LIBS -l$lib";have_inet_ntop=yes;break])
- done
- fi
-
- if test x$have_getaddrinfo = xyes; then
- if test x$have_inet_ntop = xyes; then
- have_ipv6=yes
- AC_DEFINE(ENABLE_IPV6)
- AC_MSG_RESULT($have_ipv6)
- else
- have_ipv6=no
- AC_MSG_RESULT($have_ipv6)
- fi
- fi
- fi
-else
- AC_MSG_RESULT(no)
-fi
-
-dnl borrowed from gnu findutils
-dnl and relicensed as LGPL by the FSF
-
-AC_ARG_WITH(afs,
-[ --with-afs support -fstype afs],
-[ AC_DEFINE(AFS, [], [Define if you have the Andrew File System])
- CPPFLAGS="$CPPFLAGS -I/usr/afsws/include"
- LIBS="$LIBS -L/usr/afsws/lib -L/usr/afsws/lib/afs -lsys -lrx -llwp"])
-
-AC_MSG_CHECKING(how to get filesystem type)
-fstype=no
-# The order of these tests is important.
-AC_TRY_CPP([#include <sys/statvfs.h>
-#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_STATVFS, [],
- [Define to use SVR4 statvfs to get filesystem type]) fstype=SVR4)
-if test $fstype = no; then
-AC_TRY_CPP([#include <sys/statfs.h>
-#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_USG_STATFS, [],
- [Define to use SVR3.2 statfs to get filesystem type]) fstype=SVR3)
-fi
-if test $fstype = no; then
-AC_TRY_CPP([#include <sys/statfs.h>
-#include <sys/vmount.h>], AC_DEFINE(FSTYPE_AIX_STATFS, [],
- [Define to use AIX3 statfs to get filesystem type]) fstype=AIX)
-fi
-if test $fstype = no; then
-AC_TRY_CPP([#include <mntent.h>], AC_DEFINE(FSTYPE_MNTENT, [],
- [Define to use 4.3BSD getmntent to get filesystem typ]) fstype=4.3BSD)
-fi
-if test $fstype = no; then
-AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, [],
- [Define to use 4.4BSD and OSF1 statfs to get filesystem typ]) fstype=4.4BSD/OSF1)
-fi
-if test $fstype = no; then
-AC_TRY_CPP([#include <sys/mount.h>
-#include <sys/fs_types.h>], AC_DEFINE(FSTYPE_GETMNT, [],
- [Define to use Ultrix getmnt to get filesystem typ]) fstype=Ultrix)
-fi
-AC_MSG_RESULT($fstype)
-
-dnl ****************************
-dnl IPv6 checks end here
-dnl ****************************
-
-dnl ## gdmopen building
-dnl There are perhaps others where this works
-GDMOPEN=
-AC_CHECK_HEADERS(linux/vt.h, [
- GDMOPEN=gdmopen])
-AC_SUBST(GDMOPEN)
-
-dnl ## Authentication scheme
-have_pam=no
-VRFY="verify-crypt"
-if test x$enable_authentication_scheme != xcrypt -a \
- x$enable_authentication_scheme != xshadow ; then
- AC_CHECK_HEADERS(security/pam_appl.h, [
- have_pam=yes
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lpam"
- VRFY="verify-pam"
- AC_DEFINE(HAVE_PAM)])
-fi
-
-GDMASKPASS=
-EXTRA_GDMASKPASS_LIBS=
-if test x$have_pam = xyes ; then
- AC_CHECK_HEADERS(security/pam_misc.h, [
- GDMASKPASS=gdmaskpass])
- if test x$GDMASKPASS != x ; then
- AC_CHECK_LIB(pam,misc_conv,,[AC_CHECK_LIB(pam_misc,misc_conv, [
- EXTRA_GDMASKPASS_LIBS="$EXTRA_GDMASKPASS_LIBS -lpam_misc"], [
- GDMASKPASS=], [
- -lpam])])
- fi
-fi
-AC_SUBST(GDMASKPASS)
-AC_SUBST(EXTRA_GDMASKPASS_LIBS)
-
-if test x$enable_authentication_scheme = xpam -a x$have_pam = xno ; then
- AC_MSG_ERROR(PAM support requested but not available)
-fi
-
-if test x$have_pam = xno; then
-
- # Check if -lcrypt is necessary, and if so
- # add it to the front of the link chain
- AC_CHECK_LIB(crypt, crypt, [
- EXTRA_DAEMON_LIBS="-lcrypt $EXTRA_DAEMON_LIBS"])
-
- # Check if crypt lives in a separate header file
- AC_CHECK_HEADERS(crypt.h, [
- AC_DEFINE(HAVE_CRYPT)])
-
- if test x$enable_authentication_scheme = xshadow ; then
- VRFY="verify-shadow"
- AC_DEFINE(HAVE_SHADOW)
- elif test x$enable_authentication_scheme != xcrypt ; then
- # Check for shadow passwords (hack)
- AC_MSG_CHECKING(for /etc/shadow)
-
- if test -f /etc/shadow; then
- VRFY="verify-shadow"
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_SHADOW)
- else
- AC_MSG_RESULT(no)
- fi
- fi
-
- # Check How to handle authentication with the functions 'loginrestrictions',
- # 'passwdexpired', 'chpass', 'setpwdb', 'getuserpw', 'putuserpw' and 'endpwdb'
- AC_CHECK_FUNCS(loginrestrictions)
- can_clear_admchg_flag=yes
- AC_CHECK_FUNCS([passwdexpired chpass setpwdb getuserpw putuserpw endpwdb],
- ,can_clear_admchg_flag=no)
- if test x$can_clear_admchg_flag = xyes ; then
- AC_COMPILE_IFELSE([
- #if !defined(S_READ) || !defined(S_WRITE) || !defined(PW_ADMCHG)
- choke me
- #endif
- ],
- ,[AC_CHECK_HEADERS(
- usersec.h
- ,[AC_COMPILE_IFELSE([
- #include <usersec.h>
- #if !defined(S_READ) || !defined(S_WRITE) || !defined(PW_ADMCHG)
- choke me
- #endif
- ],
- ,
- can_clear_admchg_flag=no
- )]
- ,can_clear_admchg_flag=no
- )]
- )
- fi
- if test x$can_clear_admchg_flag = xyes ; then
- AC_DEFINE(CAN_CLEAR_ADMCHG,,[Define this variable if the code to clear
- the ADMCHG flag can be compiled])
- fi
-fi
-
-AC_SUBST(VRFY)
-
-dnl Check if we can use the setpenv function to add specialvariable
-dnl to the environment (such as the /etc/environment file under AIX)
-AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[
- #ifdef HAVE_USERSEC_H
- #include <usersec.h>
- #endif
- ]],[[
- return (setpenv(NULL, (PENV_INIT | PENV_NOEXEC), NULL, NULL));
- ]])],
- can_use_setpenv=yes,
- can_use_setpenv=no)
-
-if test x$can_use_setpenv = xyes ; then
- AC_DEFINE(CAN_USE_SETPENV,,[Define this variable if the code to use
- the setpenv function can be compiled and used])
-fi
-
-
-#
-# Can we use BSD's setusercontext
-#
-AC_CHECK_HEADER(login_cap.h, [
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- AC_DEFINE(HAVE_LOGINCAP)])
-
-#
-# Check for sys/sockio.h
-#
-AC_CHECK_HEADERS(sys/sockio.h, [
- AC_DEFINE(HAVE_SYS_SOCKIO_H)])
-
-
-#
-# Xdmcp checking
-#
-XDMCP_LIBS=""
-if test x$with_xdmcp != xno ; then
- xdmcp_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- AC_CHECK_HEADER(X11/Xdmcp.h, [
- AC_CHECK_LIB(Xdmcp, XdmcpFlush, [
- AC_DEFINE(HAVE_LIBXDMCP)
- XDMCP_LIBS="-lXdmcp"
- XDMCP_SUPPORT=yes],,[$X_LIBS -lX11 $X_EXTRA_LIBS])
- ],,[#include <X11/Xproto.h>])
-
- if test x$with_xdmcp = xyes -a x$XDMCP_SUPPORT = x ; then
- AC_MSG_ERROR(XDMCP support requested but XDMCP libraries not found)
- fi
- CPPFLAGS="$xdmcp_save_CPPFLAGS"
-fi
-AC_SUBST(XDMCP_LIBS)
-
-if test x$XDMCP_SUPPORT = xyes ; then
- AM_CONDITIONAL(XDMCP_SUPPORT, true)
- GDMCHOOSER=gdmchooser
- GDMXNESTCHOOSER=gdmXnestchooser
-else
- # No need for TCP Wrappers in case XDMCP is disabled
- if test x$with_tcp_wrappers != xno ; then
- echo "TCP wrappers not needed if XDMCP is not enabled"
- fi
- with_tcp_wrappers=no
- AM_CONDITIONAL(XDMCP_SUPPORT, false)
- GDMCHOOSER=
- GDMXNESTCHOOSER=
-fi
-AC_SUBST(GDMCHOOSER)
-AC_SUBST(GDMXNESTCHOOSER)
-
-#
-# TCP Wrappers for XDMCP access control
-#
-if test x$with_tcp_wrappers = xno ; then
- echo "TCP wrappers disabled"
-else
- AC_MSG_CHECKING([whether to use TCP wrappers])
- LIBWRAP_PATH=""
- case "$host" in
- *-*-solaris*)
- if test -f /usr/sfw/lib/libwrap.so; then
- LIBWRAP_PATH=/usr/sfw/lib/libwrap.so
- echo "Found $LIBWRAP_PATH" 1>&5
- fi
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -L/usr/sfw/lib -R/usr/sfw/lib -lwrap"
- ;;
- *)
- for I in $LDFLAGS $LIBS -L/usr/lib; do
- case "$I" in
- -L*)
- THEFILE="`echo $I | sed -e 's,^-L,,'`"
- echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
- if test -f $THEFILE/libwrap.a; then
- LIBWRAP_PATH=$THEFILE/libwrap.a
- echo "Found $LIBWRAP_PATH" 1>&5
- break
- fi
- ;;
- esac
- done
- ;;
- esac
-
- if test -n "$LIBWRAP_PATH"; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- if test -n "$LIBWRAP_PATH"; then
- nm $LIBWRAP_PATH | grep 'T setenv' && LIBWRAP_PATH=""
- if test -z "$LIBWRAP_PATH"; then
- echo "*********************************************************"
- echo " You have a broken TCP wrappers library (setenv included)"
- echo " Please get the latest TCP wrappers package from your OS"
- echo " vendor, or recompile TCP wrappers to not include a"
- echo " setenv() implementation."
- echo
- echo "Not using TCP wrappers after all."
- echo "*********************************************************"
- else
- AC_DEFINE(HAVE_TCPWRAPPERS)
- fi
- fi
-
- case "$host" in
- *-*-solaris*)
- # No need for extra libwrap checking.
- ;;
- *)
- if test -n "$LIBWRAP_PATH"; then
- AC_CHECK_LIB(wrap, hosts_ctl, [
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lwrap"], [
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS $LIBWRAP_PATH"])
- fi
-
- dnl find out if we need -lnsl or whatever
- LIB_NSL=
- if test -n "$LIBWRAP_PATH"; then
- AC_MSG_CHECKING(whether -lwrap also requires -lnsl)
- ORIG_LIBS="$LIBS"
- LIBS="$EXTRA_DAEMON_LIBS $LIBS"
- AC_TRY_LINK([
-#include <tcpd.h>
-int allow_severity, deny_severity;
-], [return hosts_access;], ,[
-dnl try with -lnsl
-OLD_LIBS="$LIBS"
-LIBS="$LIBS -lnsl"
-AC_TRY_LINK([
-#include <tcpd.h>
-int allow_severity, deny_severity;
-], [return hosts_access;], LIB_NSL="-lnsl",
-LIBWRAP_PATH="")
-LIBS="$OLD_LIBS"
-])
- LIBS="$ORIG_LIBS"
- if test -n "$LIB_NSL"; then
- AC_MSG_RESULT(yes)
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS $LIB_NSL"
- else
- AC_MSG_RESULT(no)
- fi
- fi
- ;;
- esac
-fi
-
-AC_MSG_CHECKING([for corrupt government])
-AC_MSG_RESULT(yes)
-
-have_xinput=
-AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi)
-if test "x$XINPUT_LIBS" = x; then
- save_LIBS="$LIBS"
- for xinputpath in $x_libraries /usr/X11R6/lib /usr/openwin/lib; do
- LIBS="-L$xinputpath -lXi"
- case "$host" in
- *solaris*) XINPUT_RPATH_FLAGS="-R$xinputpath"
- ;;
- esac
- AC_MSG_CHECKING(for -lXi in $xinputpath)
- AC_TRY_LINK([], [XOpenDisplay()], [
- AC_MSG_RESULT(yes)
- XINPUT_LIBS="$XINPUT_RPATH_FLAGS -L$xinputpath -lXi"
- LIBS="$save_LIBS"
- break],[AC_MSG_RESULT(no)])
- done
- if test "x$XINPUT_LIBS" = x; then
- AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details)
- fi
-fi
-AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
-if test "x$have_xinput" = xyes; then
- AC_DEFINE(HAVE_XINPUT)
- X_EXTRA_LIBS="$X_EXTRA_LIBS $XINPUT_LIBS"
-fi
-
-#
-# X11 Xinerama extension
-#
-# Check for Xinerama extension (Solaris impl or Xfree impl)
-xinerama_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-# Check for defopen
-#
-if test -f /etc/default/login; then
- AC_CHECK_LIB(cmd, defopen, use_defopen=yes, use_defopen=no)
- if test "x$use_defopen" = "xyes"; then
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lcmd"
- AC_DEFINE(HAVE_DEFOPEN)
- fi
-fi
-
-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-
-if test ! x$with_xinerama = xno ; then
- case "$host" in
- *-*-solaris*)
- # Check for solaris
- use_solaris_xinerama=yes
- AC_CHECK_LIB(Xext, XineramaGetInfo,
- use_solaris_xinerama=yes, use_solaris_xinerama=no,
- $ALL_X_LIBS)
- if test "x$use_solaris_xinerama" = "xyes"; then
- AC_CHECK_HEADER(X11/extensions/xinerama.h,
- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
- fi
- AC_DEFINE(HAVE_SOLARIS_XINERAMA)
- AC_DEFINE(HAVE_XINERAMA)
- XINERAMA_LIBS=""
- XINERAMA_SUPPORT=yes,
- use_solaris_xinerama=no,
- [#include <X11/Xlib.h>])
- fi
- AC_MSG_CHECKING(for Xinerama support on Solaris)
- AC_MSG_RESULT($use_solaris_xinerama);
- ;;
- *)
- # Check for XFree
- use_xfree_xinerama=yes
- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
- [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
- fi
- AC_DEFINE(HAVE_XFREE_XINERAMA)
- AC_DEFINE(HAVE_XINERAMA)
- XINERAMA_LIBS="-lXinerama"
- XINERAMA_SUPPORT=yes,
- use_xfree_xinerama=no,
- [#include <X11/Xlib.h>])],
- use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
- AC_MSG_CHECKING(for Xinerama support on XFree86)
- AC_MSG_RESULT($use_xfree_xinerama);
- ;;
- esac
-fi
-
-AC_SUBST(XINERAMA_LIBS)
-CPPFLAGS="$xinerama_save_cppflags"
-
-#
-# Distributed Multihead X extension (DMX)
-#
-DMX_SUPPORT=""
-DMX_LIBS=""
-if test x$with_dmx != xno ; then
- dmx_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- AC_CHECK_HEADER(X11/extensions/dmxext.h, [
- AC_CHECK_LIB(dmx, DMXQueryExtension, [
- DMX_LIBS="-ldmx"
- DMX_SUPPORT=yes],,[$X_LIBS -lX11 $X_EXTRA_LIBS])
- ],,[#include <X11/Xlib.h>])
-
- if test x$with_dmx = xyes -a x$DMX_SUPPORT = x ; then
- AC_MSG_ERROR(DMX support requested but DMX librariy not found)
- fi
- CPPFLAGS="$dmx_save_CPPFLAGS"
-fi
-AC_SUBST(DMX_LIBS)
-AM_CONDITIONAL(DMX_SUPPORT, test x$DMX_SUPPORT = xyes)
-
-#
-# SELinux stuff
-#
-if test "x$with_selinux" = "xyes" ; then
- echo "SELinux support requested (--with-selinux was given), checking prerequisites"
- if test -d /usr/local/selinux/include ; then
- echo "Found /usr/local/selinux/include, will look there for SELinux stuff as well"
- CFLAGS="$CFLAGS -I/usr/local/selinux/include"
- LDFLAGS="$LDFLAGS -L/usr/local/selinux/lib"
- fi
- AC_CHECK_HEADER(selinux/selinux.h)
- AC_CHECK_HEADER(selinux/get_context_list.h)
- AC_CHECK_LIB(attr,attr_get,/bin/true)
- # I'm anal and I don't know which versions have which symbols,
- # so I check for all the ones we use
- AC_CHECK_LIB(selinux,get_ordered_context_list,/bin/true)
- AC_CHECK_LIB(selinux,freecon,/bin/true)
- AC_CHECK_LIB(selinux,freeconary,/bin/true)
- AC_CHECK_LIB(selinux,setexeccon,/bin/true)
- AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
- AC_DEFINE(HAVE_SELINUX)
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-fi
-
-#
-# Subst the extra libs
-#
-AC_SUBST(EXTRA_DAEMON_LIBS)
-AC_SUBST(EXTRA_CHOOSER_LIBS)
-AC_SUBST(EXTRA_XNEST_LIBS)
-AC_SUBST(EXTRA_FLEXI_LIBS)
-AC_SUBST(EXTRA_DYNAMIC_LIBS)
-AC_SUBST(EXTRA_SETUP_LIBS)
-
-#
-# Configuration file foo, we need to get expanded versions of a bunch of things
-# if you actually know how to code shell then fix this :-)
-# Stolen mostly from GConf
-#
-
-DATADIR_TMP="$datadir"
-EXPANDED_DATADIR=`eval echo $DATADIR_TMP`
-AC_SUBST(EXPANDED_DATADIR)
-AC_DEFINE_UNQUOTED(EXPANDED_DATADIR,"$EXPANDED_DATADIR")
-
-PIXMAPDIR_TMP="$datadir/pixmaps"
-EXPANDED_PIXMAPDIR=`eval echo $PIXMAPDIR_TMP`
-AC_SUBST(EXPANDED_PIXMAPDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_PIXMAPDIR,"$EXPANDED_PIXMAPDIR")
-
-# Only set EXPANDED_BINDIR if it is a value that is not in
-# the path already (/bin or /usr/bin)
-#
-BINDIR_TMP="$bindir"
-EXPANDED_BINDIR=`eval echo $BINDIR_TMP`
-AC_SUBST(EXPANDED_BINDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_BINDIR,"$EXPANDED_BINDIR")
-
-SBINDIR_TMP="$sbindir"
-EXPANDED_SBINDIR=`eval echo $SBINDIR_TMP`
-AC_SUBST(EXPANDED_SBINDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_SBINDIR,"$EXPANDED_SBINDIR")
-
-LIBEXECDIR_TMP="$libexecdir"
-EXPANDED_LIBEXECDIR=`eval echo $LIBEXECDIR_TMP`
-AC_SUBST(EXPANDED_LIBEXECDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_LIBEXECDIR,"$EXPANDED_LIBEXECDIR")
-
-LIBDIR_TMP="$libdir"
-EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP`
-AC_SUBST(EXPANDED_LIBDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_LIBDIR,"$EXPANDED_LIBDIR")
-
-LOCALEDIR_TMP="$sysconfdir/gdm"
-EXPANDED_LOCALEDIR=`eval echo $LOCALEDIR_TMP`
-AC_SUBST(EXPANDED_LOCALEDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_LOCALEDIR,"$EXPANDED_LOCALEDIR")
-
-AUTHDIR_TMP="$localstatedir/gdm"
-EXPANDED_AUTHDIR=`eval echo $AUTHDIR_TMP`
-AC_SUBST(EXPANDED_AUTHDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_AUTHDIR,"$EXPANDED_AUTHDIR")
-
-LOGDIR_TMP="$localstatedir/log/gdm"
-EXPANDED_LOGDIR=`eval echo $LOGDIR_TMP`
-AC_SUBST(EXPANDED_LOGDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_LOGDIR,"$EXPANDED_LOGDIR")
-
-SYSCONFDIR_TMP="$sysconfdir"
-EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
-AC_SUBST(EXPANDED_SYSCONFDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_SYSCONFDIR,"$EXPANDED_SYSCONFDIR")
-
-if test x$DMX_SUPPORT = xyes ; then
- GDM_RECONNECT_PROXY=$EXPANDED_BINDIR/gdm-dmx-reconnect-proxy
-else
- GDM_RECONNECT_PROXY=
-fi
-AC_SUBST(GDM_RECONNECT_PROXY)
-
-withval=""
-AC_ARG_WITH(at-bindir,
-[ --with-at-bindir=<PATH> PATH to Accessible Technology programs [default=EXPANDED_BINDIR]],)
-
-if test x$withval != x; then
- AT_BINDIR="$withval"
-else
- AT_BINDIR=$EXPANDED_BINDIR
-fi
-
-AC_SUBST(AT_BINDIR)
-AC_DEFINE_UNQUOTED(AT_BINDIR,"$AT_BINDIR")
-
-withval=""
-AC_ARG_WITH(configdir,
-[ --with-configdir=<PATH> PATH to Install gdm.conf configuration file [default=sysconfdir/gdm]],)
-
-if test x$withval != x; then
- GDM_CONFIGDIR="$withval"
-else
- GDM_CONFIGDIR="$sysconfdir/gdm"
-fi
-
-AC_SUBST(GDM_CONFIGDIR)
-AC_DEFINE_UNQUOTED(GDM_CONFIGDIR,"$GDM_CONFIGDIR")
-
-AC_ARG_WITH(xevie,
- [ --with-xevie=[yes/no] Add XEvIE Xserver extension support [default=no]],,
- with_xevie=no)
-
-if test x$with_xevie != xno ; then
- XEVIE_OPTION="+extension XEVIE"
-else
- XEVIE_OPTION=""
-fi
-
-AC_SUBST(XEVIE_OPTION)
-AC_DEFINE_UNQUOTED(XEVIE_OPTION,"$XEVIE_OPTION")
-
-AC_MSG_CHECKING(for fbconsole (for Solaris))
-if test -x /usr/openwin/bin/fbconsole; then
- AC_DEFINE(HAVE_FBCONSOLE)
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
-fi
-
-# Check for Solaris auditing API
-# Note, Solaris auditing not supported for Solaris 9 or earlier and
-# should not be used on these versions of Solaris if auditing is
-# required. Solaris auditing is only supported on systems that
-# support the ADT_USER enumeration value.
-#
-AC_MSG_CHECKING(for Solaris auditing API)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <bsm/adt.h>
-adt_user_context = ADT_USER;
-]], [[]])], [ check_sun_audit=yes ], [ check_sun_audit=no ])
-
-if test ${check_sun_audit} = yes
-then
- AC_DEFINE(HAVE_ADT)
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lbsm"
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
-fi
-
-# Check for Solaris logindevperm support
-#
-AC_MSG_CHECKING(for Solaris di_devperm_login)
-AC_CHECK_LIB(devinfo, di_devperm_login, [
- AC_DEFINE(HAVE_LOGINDEVPERM)
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -ldevinfo" ])
-
-# Define different Halt, and Reboot commands differently for Solaris.
-#
-# On Solaris/bin is a symlink to /usr/bin, so don't include it in
-# GDM_USER_PATH.
-#
-case "$host" in
-*solaris*)
- GDM_USER_PATH="/usr/bin"
- HALT_COMMAND="/sbin/init 5"
- REBOOT_COMMAND="/sbin/init 6"
- SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
- XSESSION_SHELL=/bin/ksh
- SOUND_PROGRAM=/usr/bin/audioplay
- ;;
-*)
- GDM_USER_PATH="/bin:/usr/bin"
- HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
- REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
- SUSPEND_COMMAND=""
- XSESSION_SHELL=/bin/sh
- SOUND_PROGRAM=/usr/bin/play
- ;;
-esac
-
-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
-# symlink to each other, and configure should use the more stable
-# location (the real directory) if possible.
-#
-if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
- X_PATH="/usr/X11R6/bin"
- X_SERVER_PATH="/usr/X11R6/bin"
- X_SERVER="/usr/X11R6/bin/X"
- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
- X_CONFIG_OPTIONS="-audit 0"
-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
- X_PATH="/usr/X11/bin"
- X_SERVER_PATH="/usr/X11/bin"
- X_SERVER="/usr/X11/bin/X"
- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
- X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/X11R6/bin/X; then
- X_PATH="/usr/X11R6/bin"
- X_SERVER_PATH="/usr/X11R6/bin"
- X_SERVER="/usr/X11R6/bin/X"
- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
- X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/X11/bin/X; then
- X_PATH="/usr/X11/bin"
- X_SERVER_PATH="/usr/X11/bin"
- X_SERVER="/usr/X11/bin/X"
- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
- X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/openwin/bin/Xsun; then
- X_PATH="/usr/openwin/bin"
- X_SERVER_PATH="/usr/openwin/bin"
- X_SERVER="/usr/openwin/bin/Xsun"
- GDM_USER_PATH="$GDM_USER_PATH:/usr/openwin/bin"
- X_CONFIG_OPTIONS="-audit 0 -nobanner"
-elif test -x /opt/X11R6/bin/X; then
- X_PATH="/opt/X11R6/bin"
- X_SERVER_PATH="/opt/X11R6/bin"
- X_SERVER="/opt/X11R6/bin/X"
- GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
- 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
- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
- X_SERVER_PATH="/usr/X11R6/bin"
- X_SERVER="/usr/X11R6/bin/X"
- GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin:/usr/openwin/bin"
- X_CONFIG_OPTIONS="-audit 0"
-fi
-
-# 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"
-fi
-
-if test "x$USER_POST_PATH" != "x"; then
- GDM_USER_PATH="$GDM_USER_PATH:$USER_POST_PATH"
-fi
-
-# 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
-# both the X.org and Xsun Xservers on the same system (but X.org on
-# Solaris doesn't ship with Xnest), so this makes Solaris work
-# properly when the X.org Xserver is included.
-#
-case "$host" in
-*solaris*)
- X_XNEST_PATH="/usr/openwin/bin"
- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
- ;;
-*)
- X_XNEST_PATH=$X_SERVER_PATH
- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
- ;;
-esac
-
-AC_SUBST(HALT_COMMAND)
-AC_DEFINE_UNQUOTED(HALT_COMMAND,"$HALT_COMMAND")
-AC_SUBST(REBOOT_COMMAND)
-AC_DEFINE_UNQUOTED(REBOOT_COMMAND,"$REBOOT_COMMAND")
-AC_SUBST(SUSPEND_COMMAND)
-AC_DEFINE_UNQUOTED(SUSPEND_COMMAND,"$SUSPEND_COMMAND")
-AC_SUBST(XSESSION_SHELL)
-AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSESSION_SHELL")
-AC_SUBST(GDM_USER_PATH)
-AC_DEFINE_UNQUOTED(GDM_USER_PATH,"$GDM_USER_PATH")
-AC_SUBST(SOUND_PROGRAM)
-AC_DEFINE_UNQUOTED(SOUND_PROGRAM,"$SOUND_PROGRAM")
-
-AC_SUBST(X_PATH)
-AC_SUBST(X_SERVER)
-AC_SUBST(X_SERVER_PATH)
-AC_SUBST(X_XNEST_PATH)
-AC_SUBST(X_XNEST_CONFIG_OPTIONS)
-AC_SUBST(X_CONFIG_OPTIONS)
-AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER")
-AC_DEFINE_UNQUOTED(X_SERVER_PATH,"$X_SERVER_PATH")
-AC_DEFINE_UNQUOTED(X_CONFIG_OPTIONS,"$X_CONFIG_OPTIONS", Options used when launching xserver)
-
-SESSDIR_TMP="$sysconfdir/gdm/Sessions"
-EXPANDED_SESSDIR=`eval echo $SESSDIR_TMP`
-AC_SUBST(EXPANDED_SESSDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_SESSDIR,"$EXPANDED_SESSDIR")
-
-## Stuff for debian/changelog.in
-#if test -e "debian/changelog"; then
-# DEBIAN_DATESTAMP=`head -1 debian/changelog| sed -e 's/.*cvs.//' -e 's/).*//'`
-# DEBIAN_DATE=`grep '^ --' debian/changelog | head -1 | sed -e 's/.* //'`
-#else
-# DEBIAN_DATESTAMP=`date +%Y%m%d%H%M%s`
-# DEBIAN_DATE=`date -R`
-#fi
-#
-#AC_SUBST(DEBIAN_DATESTAMP)
-#AC_SUBST(DEBIAN_DATE)
-
-prefix=$old_prefix
-exec_prefix=$old_exec_prefix
-
-AC_OUTPUT([
-Makefile
-daemon/Makefile
-gui/Makefile
-gui/faces/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/greeter/gdmthemetester
-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/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/Init
-config/PreSession
-config/PostSession
-daemon/gdm
-gdm-stop
-gdm-restart
-gdm-safe-restart
-gdmsetup-security
-gdm.spec
-])
-
-dnl add back when help comes back
-dnl docs/C/Makefile
-dnl omf-install/Makefile
-
-dnl <= Configuration summary =>
-
-echo ""
-echo "GDM2 configuration summary:"
-echo "==========================="
-echo ""
-
-dnl <= CFLAGS and LDFLAGS =>
-echo "CFLAGS : $CFLAGS"
-echo "LDFLAGS : $LDFLAGS"
-echo ""
-
-dnl <= Prefixes =>
-echo "prefix : $prefix"
-echo "sysconf dir : "`eval echo $sysconfdir`
-echo "bin dir : $EXPANDED_BINDIR"
-echo "sbin dir : $EXPANDED_SBINDIR"
-echo "PAM prefix : $PAM_PREFIX"
-echo "data dir : "`eval echo $datadir`
-echo "X server : "`eval echo $X_SERVER`
-echo ""
-
-dnl <= TCP Wrappers support? =>
-if test x"$LIBWRAP_PATH" = x ; then
- echo "TCP Wrappers support : NO"
-else
- echo "TCP Wrappers support : YES"
-fi
-
-dnl <= XINERAMA =>
-if test x"$XINERAMA_SUPPORT" = xyes ; then
- echo "Xinerama support : YES"
-else
- echo "Xinerama support : NO"
-fi
-
-dnl <= XDMCP =>
-if test x"$XDMCP_SUPPORT" = xyes ; then
- echo "XDMCP (remote login) support : YES"
-else
- echo "XDMCP (remote login) support : NO"
-fi
-
-dnl <= DMX =>
-if test x"$DMX_SUPPORT" = xyes ; then
- echo "DMX (Distributed Multihead X) support : YES"
-else
- echo "DMX (Distributed Multihead X) support : NO"
-fi
-
-dnl <= Console Helper =>
-if test "x$enable_console_helper" = "xyes"; then
- echo "Console helper : YES"
-else
- echo "Console helper : NO"
-fi
-
-dnl <= SELinux support =>
-if test "x$with_selinux" = "xyes" ; then
- echo "SELinux support : YES"
-else
- echo "SELinux support : NO"
-fi
-
-
-dnl <= Authentication scheme =>
-echo "Authentication scheme : $VRFY"
-
-dnl <= Utils built =>
-echo "Extra utilities built : "`echo $GDMOPEN $GDMASKPASS`
-
-echo ""
-dnl <= End of configuration summary =>
-