X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure.in;h=74235ab5a940c4cb77d8f3a8f04ab2af7c2c5700;hp=1f68445fd54342997605c05deccc8298b355caaa;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d5186197bc394e10a4402f7f6d23fbb14103bc50 diff --git a/configure.in b/configure.in index 1f68445f..74235ab5 100644 --- a/configure.in +++ b/configure.in @@ -330,7 +330,7 @@ AH_TEMPLATE([HAVE_RECORD_ANIM], # 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 "" @@ -808,6 +808,9 @@ AC_DEFUN([AC_PATH_X_APP_DEFAULTS_DIRECT],[ # 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 \ @@ -1045,6 +1048,17 @@ AC_DEFUN([AC_CHECK_GETIFADDRS], AC_DEFINE(HAVE_GETIFADDRS) fi]) +AC_DEFUN([AC_TYPE_SOCKLEN_T], + [AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ]], [[ + socklen_t socklen; + ]])],[ac_cv_type_socklen_t=yes],[ac_cv_type_socklen_t=no])]) + if test "$ac_cv_type_socklen_t" != yes; then + AC_DEFINE(socklen_t, int, + [Define to `int' if or does not define.]) + fi]) ############################################################################### # @@ -1233,7 +1247,7 @@ INSTALL_SCRIPT='${INSTALL}' # 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 @@ -1245,12 +1259,13 @@ AC_GETTIMEOFDAY_ARGS AC_SYS_LARGEFILE AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk) AC_CHECK_FUNCS(sigaction syslog realpath setrlimit) -AC_CHECK_FUNCS(setlocale) +AC_CHECK_FUNCS(setlocale sqrtf) AC_CHECK_FUNCS(getaddrinfo) AC_CHECK_MEMBERS([struct sockaddr.sa_len],,, [[#include ]]) AC_CHECK_ICMP AC_CHECK_ICMPHDR AC_CHECK_GETIFADDRS +AC_TYPE_SOCKLEN_T AC_CHECK_HEADERS(crypt.h sys/select.h) AC_PROG_PERL @@ -1294,7 +1309,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PACKAGE", generated code.]) AC_SUBST(GETTEXT_PACKAGE) -ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" +ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" AM_GLIB_GNU_GETTEXT MKINSTALLDIRS="$INSTALL_DIRS" @@ -2453,6 +2468,8 @@ esac 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 @@ -2472,23 +2489,46 @@ case "$with_login_manager_req" in ;; 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 + ;; /*) @@ -2954,6 +2994,9 @@ if test "$with_gl" = yes; then AC_MSG_RESULT(omitting "$libdir" from LDFLAGS) libdir='' + # Looks like as of OSX 10.12, gcc can't do ObjC. + OBJCC="clang -Wall" + fi @@ -3202,7 +3245,7 @@ HANDLE_X_PATH_ARG(with_gles, --with-gles, JWZGLES) 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" @@ -3510,7 +3553,7 @@ fi ############################################################################### 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 @@ -4129,12 +4172,13 @@ AC_SUBST(PERL) 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) ###############################################################################