# check for some random other files that come later in the tar file,
# to make sure everything is here.
#
-for d in driver utils hacks hacks/glx ; do
+for d in utils jwxyz hacks hacks/glx driver ; do
f=$srcdir/$d/Makefile.in
if test \! -r $f ; then
echo ""
# Look for the directory under a standard set of common directories.
# Check X11 before X11Rn because it's often a symlink to the current release.
for ac_dir in \
+ \
+ /usr/share/X11/app-defaults \
+ \
/usr/X11/lib/app-defaults \
/usr/X11R6/lib/app-defaults \
/usr/X11R6/lib/X11/app-defaults \
# random libc stuff
AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(unistd.h inttypes.h)
AC_TYPE_MODE_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
with_login_manager_req=unspecified
default_login_manager_1='gdmflexiserver -ls'
default_login_manager_2='kdmctl reserve'
+default_login_manager_3='lxdm -c USER_SWITCH'
+default_login_manager_4='dm-tool switch-to-greeter'
AC_ARG_WITH(login-manager,
[ --with-login-manager Put a "New Login" button on the unlock dialog that
;;
yes|unspecified)
- # Try both defaults, use the one that exists.
+ # Try various defaults, use the first one that exists.
- set dummy $default_login_manager_1 ; login_manager_tmp=$2
- unset ac_cv_path_login_manager_tmp # don't cache
- AC_PATH_PROG(login_manager_tmp, $login_manager_tmp, [])
- if test ! -z "$login_manager_tmp" ; then
- with_login_manager="$default_login_manager_1"
- else
+ with_login_manager=""
+
+ if test -z "$with_login_manager" ; then
+ set dummy $default_login_manager_1 ; login_manager_tmp=$2
+ unset ac_cv_path_login_manager_tmp # don't cache
+ AC_PATH_PROG(login_manager_tmp, $login_manager_tmp, [])
+ if test ! -z "$login_manager_tmp" ; then
+ with_login_manager="$default_login_manager_1"
+ fi
+ fi
+
+ if test -z "$with_login_manager" ; then
set dummy $default_login_manager_2 ; login_manager_tmp=$2
unset ac_cv_path_login_manager_tmp # don't cache
AC_PATH_PROG(login_manager_tmp, $login_manager_tmp, [])
if test ! -z "$login_manager_tmp" ; then
with_login_manager="$default_login_manager_2"
- else
- with_login_manager=""
fi
fi
+
+ if test -z "$with_login_manager" ; then
+ set dummy $default_login_manager_3 ; login_manager_tmp=$2
+ unset ac_cv_path_login_manager_tmp # don't cache
+ AC_PATH_PROG(login_manager_tmp, $login_manager_tmp, [])
+ if test ! -z "$login_manager_tmp" ; then
+ with_login_manager="$default_login_manager_3"
+ fi
+ fi
+
+ if test -z "$with_login_manager" ; then
+ set dummy $default_login_manager_4 ; login_manager_tmp=$2
+ unset ac_cv_path_login_manager_tmp # don't cache
+ AC_PATH_PROG(login_manager_tmp, $login_manager_tmp, [])
+ if test ! -z "$login_manager_tmp" ; then
+ with_login_manager="$default_login_manager_4"
+ fi
+ fi
+
;;
/*)
if test "$with_gles" = yes; then
have_gles=yes
AC_DEFINE(HAVE_JWZGLES)
- JWZGLES_OBJS="jwzgles.o"
+ JWZGLES_OBJS='$(JWXYZ_BIN)/jwzgles.o'
AC_MSG_RESULT(using OpenGL ES compatiblity shim)
elif test "$with_gles" != no; then
echo "error: must be yes or no: --with-gles=$with_xpm"
###############################################################################
PTY_LIBS=
-AC_CHECK_HEADERS(pty.h util.h)
+AC_CHECK_HEADERS(pty.h util.h sys/termios.h)
AC_CHECK_X_LIB(util, forkpty,
[PTY_LIBS="-lutil"
ac_have_forkpty=yes
AC_OUTPUT(Makefile
utils/Makefile
- driver/Makefile
- driver/xscreensaver.pam
- driver/xscreensaver-demo.glade2
+ jwxyz/Makefile
hacks/Makefile
hacks/glx/Makefile
po/Makefile.in
+ driver/Makefile
+ driver/xscreensaver.pam
+ driver/xscreensaver-demo.glade2
driver/XScreenSaver.ad)
###############################################################################