X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=457af807905c463e89ee362fb467f2a3796b669e;hb=50be9bb40dc60130c99ffa568e6677779904ff70;hp=fbde9f84753f8824420dd3b979fb0eac0df80b1b;hpb=0d6b320def9180cf907ceaed56b23a972a11b757;p=xscreensaver diff --git a/configure.in b/configure.in index fbde9f84..457af807 100644 --- a/configure.in +++ b/configure.in @@ -94,6 +94,12 @@ AH_TEMPLATE([HAVE_XINERAMA], elsewhere. (It's available if the file /usr/include/X11/extensions/Xinerama.h exists.)]) +AH_TEMPLATE([HAVE_XINPUT], + [Define this if you have the Xinput extension. This is + standard since X11R5, and is thus almost everywhere. + (It's available if the file /usr/include/X11/extensions/XInput.h + exists.)]) + AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE], [Define this if you have the XF86MiscSetGrabKeysState function (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key @@ -106,6 +112,9 @@ AH_TEMPLATE([HAVE_RANDR], possibly elsewhere. (It's available if the file /usr/include/X11/extensions/Xrandr.h exists.)]) +AH_TEMPLATE([HAVE_RANDR_12], + [Define this if the RANDR library is version 1.2 or newer.]) + AH_TEMPLATE([HAVE_PROC_INTERRUPTS], [Define this if you have a Linux-like /proc/interrupts file which can be examined to determine when keyboard activity has @@ -142,6 +151,10 @@ AH_TEMPLATE([HAVE_GDK_PIXBUF], [Define this if you have the GDK_Pixbuf library installed. Some of the demos can make use of this if it is available.]) +AH_TEMPLATE([HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION], + [Define this if you have the gdk_pixbuf_apply_embedded_orientation + function (gdk-pixbuf 2.12).]) + AH_TEMPLATE([HAVE_JPEGLIB], [Define this if you have the Independent JPEG Group's JPEG library installed. Some of the demos can make use of this if it @@ -191,6 +204,9 @@ AH_TEMPLATE([PASSWD_HELPER_PROGRAM], AH_TEMPLATE([NO_LOCKING], [Define this to remove the option of locking the screen at all.]) +AH_TEMPLATE([ALLOW_ROOT_PASSWD], + [Define this to allow the root password to unlock the screen.]) + AH_TEMPLATE([HAVE_KERBEROS], [Define this if you want to use Kerberos authentication to lock/unlock the screen instead of your local password. This @@ -221,10 +237,17 @@ AH_TEMPLATE([PAM_SERVICE_NAME], configured for xlock, so setting this to "xlock" would also work in that case.]) +AH_TEMPLATE([HAVE_PAM_FAIL_DELAY], + [Define this if you have pam_fail_delay function. + see driver/passwd-pam.c.]) + AH_TEMPLATE([PAM_STRERROR_TWO_ARGS], [Define if you have PAM and pam_strerror() requires two arguments.]) +AH_TEMPLATE([HAVE_SIGTIMEDWAIT], + [Define to 1 if you have the `sigtimedwait' function.]) + AH_TEMPLATE([HAVE_SHADOW_PASSWD], [Define this if your system uses 'shadow' passwords, that is, the passwords live in /etc/shadow instead of /etc/passwd, and one @@ -250,15 +273,6 @@ AH_TEMPLATE([HAVE_HPUX_PASSWD], Passwords'' (if you have /usr/include/hpsecurity.h, you probably have this.) I haven't tested this one, let me know if it works.]) -AH_TEMPLATE([HAVE_VT_LOCKSWITCH], - [Define this if you are on a system that supports the - VT_LOCKSWITCH and VT_UNLOCKSWITCH ioctls. If this is defined, - then when the screen is locked, switching to another virtual - terminal will also be prevented. That is, the whole console - will be locked, rather than just the VT on which X is running. - (Well, that's the theory anyway -- in practice, I haven't yet - figured out how to make that work.)]) - AH_TEMPLATE([HAVE_SYSLOG], [Define this if you the openlog(), syslog(), and closelog() functions. This is used for logging failed login attempts.]) @@ -350,10 +364,10 @@ AC_DEFUN(AC_PROG_CC_ANSI, if test -n "$GCC"; then AC_MSG_RESULT(Turning on gcc compiler warnings.) - CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs" + CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs -Wmissing-prototypes" OBJCC="$OBJCC -Wall" - # supposedly gcc 3.4 will have "-Wdeclaration-after-statement" - # and then perhaps we can do without -pedantic? + # As of gcc 3.4, we have "-Wdeclaration-after-statement" + # and so perhaps now we can do without -pedantic? else case "$host" in *-irix5* |*-irix6.[0-3]* ) @@ -373,7 +387,42 @@ AC_DEFUN(AC_PROG_CC_ANSI, ############################################################################### # -# Functions to figure out how to disable // comments in ANSI C code. +# Check for availability of various gcc command-line options. +# +############################################################################### + +AC_DEFUN(AC_CHECK_GCC_ARG, + [if test -n "$GCC"; then + AC_CACHE_CHECK([whether gcc accepts [$2]], + ac_cv_gcc_accepts_[$1], + [rm -rf conftest.$ac_ext + touch conftest.$ac_ext + if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + grep unrecognized >/dev/null ); then + ac_cv_gcc_accepts_[$1]=no + else + ac_cv_gcc_accepts_[$1]=yes + CC="$CC [$2]" + fi]) + ac_gcc_accepts_[$1]="$ac_cv_gcc_accepts_[$1]" + fi +]) + +AC_DEFUN(AC_NO_LONG_STRING_WARNINGS, + [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings)]) + +AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS, + [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)]) + +# Need to disable Objective C extensions in ANSI C on MacOS X to work +# around an Apple-specific gcc bug. +# +AC_DEFUN(AC_NO_OBJECTIVE_C, + [AC_CHECK_GCC_ARG(no_cpp_precomp, -no-cpp-precomp)]) + +############################################################################### +# +# Function to figure out how to disable // comments in ANSI C code. # # (With recent gcc, this is done with "-std=c89". With older gcc, this # is done by passing "-lang-c89" to cpp, by passing "-Wp,-lang-c89" to @@ -391,18 +440,16 @@ AC_DEFUN(AC_PROG_CC_ANSI, # ############################################################################### -AC_DEFUN(AC_GCC_ACCEPTS_STD, - [if test -n "$GCC"; then - AC_CACHE_CHECK([whether gcc accepts -std], - ac_cv_gcc_accepts_std, - [if ( ( gcc -E -std=c89 - /dev/null ) 2>&1 | \ - grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_std=no - else - ac_cv_gcc_accepts_std=yes - fi]) - ac_gcc_accepts_std="$ac_cv_gcc_accepts_std" - fi +AC_DEFUN(AC_GCC_ACCEPTS_STD, [ + case "$host" in + *-darwin* ) + # Fucking Apple let // comments sneak into OpenGL headers, so + # we *must* allow // comments when compiling on Mac OS 10.6! FUCK! + ;; + *) + AC_CHECK_GCC_ARG(std, -std=c89) + ;; + esac ]) AC_DEFUN(AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE, @@ -428,42 +475,11 @@ AC_DEFUN(AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE, # before they were in the ANSI C 99 spec... (gcc 2.96 permits // # with -std=gnu89 but not with -std=c89.) # - CC="$CC -std=c89 -U__STRICT_ANSI__" - else - # The old way: - CC="$CC -Wp,-lang-c89" - fi - fi -]) - - -############################################################################### -# -# Function to figure out how to turn off Objective C on MacOS X. -# (We have to do this to work around an Apple-specific gcc bug.) -# -############################################################################### - -AC_DEFUN(AC_GCC_ACCEPTS_NO_CPP_PRECOMP, - [if test -n "$GCC"; then - AC_CACHE_CHECK([whether gcc accepts -no-cpp-precomp], - ac_cv_gcc_accepts_no_cpp_precomp, - [if ( ( gcc -E -no-cpp-precomp - /dev/null ) 2>&1 | \ - grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_no_cpp_precomp=no - else - ac_cv_gcc_accepts_no_cpp_precomp=yes - fi]) - ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" - fi -]) - -AC_DEFUN(AC_NO_OBJECTIVE_C, - [if test -n "$GCC"; then - AC_GCC_ACCEPTS_NO_CPP_PRECOMP - if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then - AC_MSG_RESULT(Disabling Objective C extensions in ANSI C code.) - CC="$CC -no-cpp-precomp" + # $CC already contains "-std=c89" via AC_GCC_ACCEPTS_STD + CC="$CC -U__STRICT_ANSI__" +# else +# # The old way: +# CC="$CC -Wp,-lang-c89" fi fi ]) @@ -711,6 +727,17 @@ EOF rm -fr conftestdir fi]) +############################################################################### +# +# Handle the --with-x-app-defaults option HERE +# +############################################################################### + +AC_ARG_WITH(x-app-defaults,[], + [ac_cv_x_app_defaults="$withval"], + [eval ac_x_app_defaults="$withval"]) + + 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. @@ -948,6 +975,7 @@ AC_DEFUN(AC_CHECK_X_HEADER, [ CPPFLAGS="$CPPFLAGS -I$includedir" fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` AC_CHECK_HEADER([$1],[$2],[$3],[$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) @@ -959,6 +987,7 @@ AC_DEFUN(AC_EGREP_X_HEADER, [ CPPFLAGS="$CPPFLAGS -I$includedir" fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` AC_EGREP_HEADER([$1], [$2], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) @@ -970,6 +999,7 @@ AC_DEFUN(AC_TRY_X_COMPILE, [ CPPFLAGS="$CPPFLAGS -I$includedir" fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` AC_TRY_COMPILE([$1], [$2], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) @@ -994,6 +1024,8 @@ AC_DEFUN(AC_CHECK_X_LIB, [ # note: $X_LIBS includes $x_libraries LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5]) CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" @@ -1009,6 +1041,7 @@ AC_DEFUN(AC_TRY_X_RUN, [ CPPFLAGS="$CPPFLAGS -I$includedir" fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` AC_TRY_RUN([$1], [$2], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) @@ -1078,11 +1111,18 @@ AC_DEFUN(HANDLE_X_PATH_ARG, [ ############################################################################### ############################################################################### +# WTF! autoconf emits this *way* too late. Do it earlier. +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + + # random compiler setup AC_CANONICAL_HOST AC_PROG_CC_ANSI -AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE +AC_NO_LONG_STRING_WARNINGS +AC_NO_MISPLACED_DECLARATIONS AC_NO_OBJECTIVE_C +AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE AC_PROG_CPP AC_C_CONST AC_C_INLINE @@ -1114,6 +1154,7 @@ AC_HEADER_DIRENT AC_GETTIMEOFDAY_ARGS 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_ICMP AC_CHECK_ICMPHDR AC_CHECK_HEADERS(crypt.h sys/select.h) @@ -1144,15 +1185,6 @@ AC_MSG_CHECKING(whether this is MacOS X) AC_MSG_RESULT($ac_macosx) -if test "$ac_macosx" = yes; then - if test -n "$GCC"; then - # Without these, every link against libGL gets a bunch of useless warnings. - osx_crud="-bind_at_load -multiply_defined suppress" - AC_MSG_RESULT(adding "$osx_crud" to LDFLAGS) - LDFLAGS="$LDFLAGS $osx_crud" - fi -fi - ############################################################################### # # Gettext support @@ -1168,7 +1200,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 no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" +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" AM_GLIB_GNU_GETTEXT MKINSTALLDIRS="$INSTALL_DIRS" @@ -1265,6 +1297,9 @@ fi # canonicalize slashes. HACKDIR=`echo "${HACKDIR}" | sed 's@/$@@;s@//*@/@g'` +# Expand HACKDIR as HACKDIR_FULL +HACKDIR_FULL=`eval eval eval eval eval eval eval eval eval echo $HACKDIR` + # This option used to be called --enable-subdir; make sure that is no longer # used, since configure brain-damagedly ignores unknown --enable options. @@ -1281,6 +1316,7 @@ fi ############################################################################### # # Handle the --with-configdir option +# Help for --with-x-app-defaults option added.. # ############################################################################### @@ -1290,6 +1326,8 @@ AC_ARG_WITH(configdir, [ --with-configdir=DIR Where to install the data files that describe each of the display modes to the GUI. Default: `PREFIX/share/xscreensaver/config/' + --with-x-app-defaults=DIR + Where to install xscreensaver configuration file. ], [with_configdir="$withval"; with_configdir_req="$withval"], [with_configdir=yes]) @@ -1511,6 +1549,45 @@ elif test "$with_xinerama" != no; then fi +############################################################################### +# +# Check for the XINPUT server extension. +# +############################################################################### + +have_xinput=no +with_xinput_req=unspecified +AC_ARG_WITH(xinput-ext, +[ --with-xinput-ext Include support for the XInput extension.], + [with_xinput="$withval"; with_xinput_req="$withval"], [with_xinput=yes]) + +HANDLE_X_PATH_ARG(with_xinput, --with-xinput-ext, XINPUT) + +if test "$with_xinput" = yes; then + + # first check for Xinput.h + AC_CHECK_X_HEADER(X11/extensions/XInput.h, [have_xinput=yes],, + [#include ]) + + # if that succeeded, then check for libXi + if test "$have_xinput" = yes; then + have_xinput=no + AC_CHECK_X_LIB(Xi, XListInputDevices, + [have_xinput=yes; SAVER_LIBS="$SAVER_LIBS -lXi"], + [true], -lXext -lX11) + fi + + # if that succeeded, then we've really got it. + if test "$have_xinput" = yes; then + AC_DEFINE(HAVE_XINPUT) + fi + +elif test "$with_xinput" != no; then + echo "error: must be yes or no: --with-xinput-ext=$with_xinput" + exit 1 +fi + + ############################################################################### # # Check for the XF86VMODE server extension (for virtual screens.) @@ -1637,7 +1714,7 @@ HANDLE_X_PATH_ARG(with_randr, --with-randr-ext, RANDR) if test "$with_randr" = yes; then - # first check for Randr.h + # first check for Xrandr.h AC_CHECK_X_HEADER(X11/extensions/Xrandr.h, [have_randr=yes],, [#include ]) @@ -1666,8 +1743,26 @@ if test "$with_randr" = yes; then # if that succeeded, then we've really got it. if test "$have_randr" = yes; then AC_DEFINE(HAVE_RANDR) + + # Now check for version 1.2 in the same libs. + # Try to compile, since on MacOS 10.5.7, headers are older than libs! + AC_CACHE_CHECK([for XRRGetScreenResources], ac_cv_randr_12, + [ac_cv_randr_12=no + AC_TRY_X_COMPILE([#include + #include + #include ], + [XRRScreenResources *res = + XRRGetScreenResources (0, 0);], + [ac_cv_randr_12=yes], + [ac_cv_randr_12=no])]) + if test "$ac_cv_randr_12" = yes ; then + AC_DEFINE(HAVE_RANDR_12) + fi +# AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)], +# [true], $SAVER_LIBS) fi + elif test "$with_randr" != no; then echo "error: must be yes or no: --with-randr-ext=$with_randr" exit 1 @@ -1723,6 +1818,13 @@ AC_ARG_WITH(proc-interrupts, if test "$with_proc_interrupts" = yes; then + # Note that we may be building in an environment (e.g. Debian buildd chroot) + # without a proper /proc filesystem. If /proc/interrupts exists, then we'll + # check that it has the bits we need, but otherwise we'll just go on faith. + # + have_proc_interrupts=yes + + if test -f /proc/interrupts; then AC_CACHE_CHECK([whether /proc/interrupts contains keyboard data], ac_cv_have_proc_interrupts, [ac_cv_have_proc_interrupts=no @@ -1731,6 +1833,7 @@ if test "$with_proc_interrupts" = yes; then fi ]) have_proc_interrupts=$ac_cv_have_proc_interrupts + fi if test "$have_proc_interrupts" = yes; then AC_DEFINE(HAVE_PROC_INTERRUPTS) @@ -1751,7 +1854,15 @@ fi AC_ARG_ENABLE(locking,[Screen locking options: --enable-locking Compile in support for locking the display. --disable-locking Do not allow locking at all.], - [enable_locking="$enableval"],[enable_locking=yes]) + [enable_locking="$enableval"], + [if test "$ac_macosx" = yes; then + # We can't lock on MacOS X, so default to not compiling in support for it. + # But allow --enable-locking to override that, so I can debug Linux locking + # under MacOS X11. + enable_locking=no + else + enable_locking=yes + fi]) if test "$enable_locking" = yes; then true elif test "$enable_locking" = no; then @@ -1761,56 +1872,23 @@ else exit 1 fi -# We can't lock on MacOS X, so don't even bother compiling in support for it. -# -if test "$ac_macosx" = yes; then - if test "$enable_locking" = yes; then - AC_MSG_RESULT(locking disabled: it doesn't work on MacOS X) - enable_locking=no - AC_DEFINE(NO_LOCKING) - fi -fi - ############################################################################### # -# The --enable-vt-locking option +# Whether to allow root password to unblank. # ############################################################################### - -#ac_vt_lockswitch=no -#AC_ARG_ENABLE(vt-locking,[ -# --enable-vt-locking Compile in support for locking Virtual Terminals. -# This is the default if the system supports it, and -# if locking support is included (--enable-locking.) -# --disable-vt-locking Do not allow locking of VTs, even if locking is -# enabled.], -# [enable_vt_locking="$enableval"],[enable_vt_locking=yes]) -#if test "$enable_vt_locking" = yes; then -# -# AC_CACHE_CHECK([for the VT_LOCKSWITCH ioctl], ac_cv_vt_lockswitch, -# [AC_TRY_COMPILE([#include -# #include -# #include ], -# [int x = VT_LOCKSWITCH; int y = VT_UNLOCKSWITCH;], -# [ac_cv_vt_lockswitch=yes], -# [ac_cv_vt_lockswitch=no])]) -# ac_vt_lockswitch=$ac_cv_vt_lockswitch -# -#elif test "$enable_vt_locking" = no; then -# true -#else -# echo "error: must be yes or no: --enable-vt-locking=$enable_vt_locking" -# exit 1 -#fi -# -#if test "$ac_vt_lockswitch" = yes; then -# AC_DEFINE(HAVE_VT_LOCKSWITCH) -# # the VT_LOCKSWITCH ioctl can only be used when running as root. -# # #### but it doesn't work yet, so don't worry about that for now. -## need_setuid=yes -#fi - +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: must be yes or no: --enable-root-passwd=$enable_root_passwd" + exit 1 +fi ############################################################################### # @@ -1863,26 +1941,30 @@ if test "$enable_locking" = yes -a "$with_pam" = yes; then # On Linux, sigtimedwait() is in libc; on Solaris, it's in librt. have_timedwait=no - AC_CHECK_LIB(c, sigtimedwait, [have_timedwait=yes]) + AC_CHECK_LIB(c, sigtimedwait, + [have_timedwait=yes + AC_DEFINE(HAVE_SIGTIMEDWAIT)]) if test "$have_timedwait" = no ; then - AC_CHECK_LIB(rt, sigtimedwait, [PASSWD_LIBS="${PASSWD_LIBS} -lrt"]) + AC_CHECK_LIB(rt, sigtimedwait, [have_timedwait=yes + AC_DEFINE(HAVE_SIGTIMEDWAIT) + PASSWD_LIBS="${PASSWD_LIBS} -lrt"]) fi AC_MSG_CHECKING(how to call pam_strerror) AC_CACHE_VAL(ac_cv_pam_strerror_args, - [AC_TRY_COMPILE([#include - #include - #include ], - [pam_handle_t *pamh = 0; - char *s = pam_strerror(pamh, PAM_SUCCESS);], - [ac_pam_strerror_args=2], - [AC_TRY_COMPILE([#include - #include - #include ], - [char *s = - pam_strerror(PAM_SUCCESS);], - [ac_pam_strerror_args=1], - [ac_pam_strerror_args=0])]) + [AC_TRY_X_COMPILE([#include + #include + #include ], + [pam_handle_t *pamh = 0; + char *s = pam_strerror(pamh, PAM_SUCCESS);], + [ac_pam_strerror_args=2], + [AC_TRY_X_COMPILE([#include + #include + #include ], + [char *s = + pam_strerror(PAM_SUCCESS);], + [ac_pam_strerror_args=1], + [ac_pam_strerror_args=0])]) ac_cv_pam_strerror_args=$ac_pam_strerror_args]) ac_pam_strerror_args=$ac_cv_pam_strerror_args if test "$ac_pam_strerror_args" = 1 ; then @@ -1893,6 +1975,28 @@ if test "$enable_locking" = yes -a "$with_pam" = yes; then else AC_MSG_RESULT(unknown) fi + +# Check pam_fail_delay + AC_MSG_CHECKING(pam_fail_delay in -lpam) + AC_CACHE_VAL(ac_cv_pam_fail_delay, + [ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="-lpam" + AC_TRY_LINK([#include ], + [pam_handle_t *pamh = 0; + unsigned int usec = 1; + int status = pam_fail_delay (pamh, usec);], + [ac_pam_fail_delay=yes], + [ac_pam_fail_delay=no]) + ac_cv_pam_fail_delay=$ac_pam_fail_delay, + LDFLAGS=$ac_save_LDFLAGS]) + + if test "$ac_pam_fail_delay" = yes ; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_PAM_FAIL_DELAY) + else + AC_MSG_RESULT(no) + fi + fi fi @@ -2238,15 +2342,15 @@ esac # ############################################################################### -have_login_manager=no with_login_manager_req=unspecified -default_login_manager='gdmflexiserver -l' +default_login_manager_1='gdmflexiserver -ls' +default_login_manager_2='kdmctl reserve' AC_ARG_WITH(login-manager, [ --with-login-manager Put a "New Login" button on the unlock dialog that - runs a login manager such as gdmflexiserver.], + runs a login manager like gdmflexiserver or kdmctl.], [with_login_manager="$withval"; with_login_manager_req="$withval"], - [with_login_manager=no]) + [with_login_manager=yes]) # no HANDLE_X_PATH_ARG for this one if test "$enable_locking" = no ; then @@ -2254,54 +2358,70 @@ if test "$enable_locking" = no ; then with_login_manager=no fi -if test -n "$with_login_manager_req" ; then - ac_cv_login_manager_program="" +case "$with_login_manager_req" in + no) + with_login_manager="" + ;; - if test "$with_login_manager_req" = "yes" ; then - with_login_manager_req=$default_login_manager - fi + yes|unspecified) + # Try both defaults, use the one that exists. - case "$with_login_manager_req" in - /*) - # absolute path - set dummy $with_login_manager_req ; login_manager_tmp=$2 - AC_MSG_CHECKING([for $login_manager_tmp]) - if test -x "$login_manager_tmp" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - with_login_manager="" - fi - ;; - *) - # relative path - set dummy $with_login_manager_req ; login_manager_tmp=$2 - # don't cache - unset ac_cv_path_login_manager_tmp + 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 + 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="" + if test ! -z "$login_manager_tmp" ; then + with_login_manager="$default_login_manager_2" else - with_login_manager="$login_manager_tmp" + with_login_manager="" fi - ;; - esac - ac_cv_login_manager_program="$with_login_manager" + fi + ;; -elif test -n "$ac_cv_login_manager_program"; then - AC_MSG_RESULT([checking for login_manager... (cached) $ac_cv_login_manager_program]) -fi + /*) + # absolute path specified on cmd line + set dummy $with_login_manager_req ; login_manager_tmp=$2 + AC_MSG_CHECKING([for $login_manager_tmp]) + if test -x "$login_manager_tmp" ; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + with_login_manager="" + fi + ;; + + *) + # relative path specified on cmd line + set dummy $with_login_manager_req ; 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="" + else + with_login_manager="$login_manager_tmp" + fi + ;; +esac +ac_cv_login_manager_program="$with_login_manager" NEW_LOGIN_COMMAND_P='' NEW_LOGIN_COMMAND="$ac_cv_login_manager_program" +AC_MSG_CHECKING(for login manager) if test -z "$NEW_LOGIN_COMMAND" ; then - NEW_LOGIN_COMMAND="$default_login_manager" + NEW_LOGIN_COMMAND="$default_login_manager_1" NEW_LOGIN_COMMAND_P='! ' + AC_MSG_RESULT($NEW_LOGIN_COMMAND (disabled)) +else + AC_MSG_RESULT($NEW_LOGIN_COMMAND) fi - ############################################################################### # # Check for -lgtk (and Gnome stuff) @@ -2451,6 +2571,7 @@ fi # Check for the various Gnome help and URL loading programs. # +WITH_BROWSER=gnome-open if test "$have_gtk" = yes; then AC_CHECK_PROGS(gnome_open_program, gnome-open) AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show) @@ -2675,14 +2796,37 @@ if test "$with_gl" = yes; then # AC_CACHE_CHECK([whether GL is really MesaGL], ac_cv_have_mesa_gl, [ac_cv_have_mesa_gl=no - AC_EGREP_X_HEADER(Mesa|MESA, GL/glx.h, [ac_cv_have_mesa_gl=yes]) - ]) + if test "$ac_macosx" = no; then + # WTF! MacOS 10.5.0 ships the Mesa GL headers! + # It's not really Mesa, is it? + AC_EGREP_X_HEADER(Mesa|MESA, GL/glx.h, [ac_cv_have_mesa_gl=yes]) + fi]) ac_have_mesa_gl=$ac_cv_have_mesa_gl - gl_lib_1="" GL_LIBS="" + if test "$ac_macosx" = yes; then + + # Without these, every link against libGL gets a bunch of useless + # warnings. + # + osx_crud="-bind_at_load -multiply_defined suppress" + AC_MSG_RESULT(adding "$osx_crud" to GL_LIBS) + GL_LIBS="$GL_LIBS $osx_crud" + unset osx_crud + + # New lossage in 10.5.0: without this, we get: + # ld: cycle in dylib re-exports with /usr/X11/lib/libGL.dylib + # + osx_crud="/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" + osx_crud="-Wl,-dylib_file,${osx_crud}:${osx_crud}" + + AC_MSG_RESULT(adding "$osx_crud" to GL_LIBS) + GL_LIBS="$GL_LIBS $osx_crud" + unset osx_crud + fi + # Some versions of MesaGL are compiled to require -lpthread. # So if the Mesa headers exist, and -lpthread exists, then always @@ -3027,6 +3171,12 @@ if test "$with_gdk_pixbuf" = yes; then else AC_MSG_RESULT(checking for gdk_pixbuf usability... no) fi + + if test "$have_gdk_pixbuf" = yes; then + AC_CHECK_X_LIB(c, gdk_pixbuf_apply_embedded_orientation, + [AC_DEFINE(HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION)],, + $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm) + fi fi @@ -3065,6 +3215,10 @@ if test "$have_motif" = yes -a "$have_xpm" = yes ; then fi fi +if test "$XPM_LIBS" = "" ; then + XPM_LIBS=$(MINIXPM) +fi + ############################################################################### # @@ -3331,8 +3485,8 @@ AC_ARG_WITH(text-file, case "$with_textfile" in /*) # absolute path - AC_MSG_CHECKING([for image directory $with_textfile]) - if test -d "$with_textfile" ; then + AC_MSG_CHECKING([for text file $with_textfile]) + if test -f "$with_textfile" ; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -3344,9 +3498,11 @@ case "$with_textfile" in #### Could use some more defaults here... for f in \ - "/usr/X11R6/lib/X11/doc/README" \ - "/usr/share/doc/xserver-common/copyright" \ - "/usr/X11R6/README" \ + "/usr/X11R6/lib/X11/doc/README" \ + "/usr/share/doc/xserver-common/copyright" \ + "/usr/share/doc/xserver-xorg-core/copyright" \ + "/usr/X11R6/README" \ + "/usr/share/doc/debian/debian-manifesto" \ ; do if test -z "$with_textfile"; then AC_MSG_CHECKING([for text file $f]) @@ -3365,7 +3521,7 @@ case "$with_textfile" in ;; *) - echo "error: must be an absolute path: --with-image-directory=$with_textfile_req" + echo "error: must be an absolute path: --with-text-file=$with_textfile_req" exit 1 ;; esac @@ -3374,6 +3530,45 @@ ac_cv_textfile="$with_textfile" DEFAULT_TEXT_FILE="$ac_cv_textfile" +############################################################################### +# +# Check the browser to see help URL +# +############################################################################### + +have_browser=no +with_browser_req=unspecified + +AC_ARG_WITH(browser, +[ --with-browser=BROWSER Specify the browser to show help URL.], + [with_browser="$withval"; with_browser_req="$withval"], + [with_browser=no ]) +# no HANDLE_X_PATH_ARG for this one + +case "$with_browser" in + no ) + ;; + * ) + WITH_BROWSER=$with_browser + gnome_open_program=$with_browser + AC_MSG_CHECKING([for browser $with_browser]) + with_browser_fullpath=`which $with_browser 2>/dev/null` + case $with_browser_fullpath in + /* ) + AC_MSG_RESULT(yes) + have_browser=yes + ;; + * ) + AC_MSG_RESULT(no) +# Only warning: we don't want to install all packages for the +# dependency of the browser in building stage... + echo "WARNING: browser not found: --with-browser=$with_browser" + ;; + esac + ;; +esac +ac_cv_browser="$with_browser" + ############################################################################### # # Check whether it's ok to install some hacks as setuid (e.g., "sonar") @@ -3485,18 +3680,20 @@ fi tab=' ' if test "$have_gl" = yes; then GL_EXES='$(GL_EXES)' + SUID_EXES='$(SUID_EXES)' + RETIRED_GL_EXES='$(RETIRED_GL_EXES)' GL_UTIL_EXES='$(GL_UTIL_EXES)' GL_MEN='$(GL_MEN)' - GL_KLUDGE="${tab} " + GL_KLUDGE=" " else - GL_KLUDGE="-${tab} " + GL_KLUDGE="-" fi if test "$have_gle" = yes; then GLE_EXES='$(GLE_EXES)' - GLE_KLUDGE="${tab} " + GLE_KLUDGE=" " else - GLE_KLUDGE="-${tab} " + GLE_KLUDGE="-" fi if test "$have_jpeg" = yes -a "$have_gdk_pixbuf" = yes; then @@ -3537,12 +3734,7 @@ if test -z "$PO_DATADIR" ; then # Map /build/prefix/usr/X11R6/share/ to /build/prefix/usr/share/ # but of course we need to expand all the nested variables to do that... # - dd=$datadir - eval dd=${dd} - eval dd=${dd} - eval dd=${dd} - eval dd=${dd} - eval dd=${dd} + dd=`eval eval eval eval eval eval eval eval eval eval eval echo $datadir` PO_DATADIR=`echo $dd | sed 's@/X11R6/@/@'` fi @@ -3591,11 +3783,13 @@ AC_SUBST(SETUID_HACKS) AC_SUBST(INSTALL_DIRS) AC_SUBST(NEED_SETUID) AC_SUBST(INSTALL_PAM) +AC_SUBST(HAVE_PAM_FAIL_DELAY) AC_SUBST(NEW_LOGIN_COMMAND) AC_SUBST(NEW_LOGIN_COMMAND_P) AC_SUBST(DEFAULT_IMAGES_P) AC_SUBST(DEFAULT_IMAGE_DIRECTORY) AC_SUBST(DEFAULT_TEXT_FILE) +AC_SUBST(WITH_BROWSER) AC_SUBST(OBJCC) AC_SUBST(EXES_OSX) @@ -3614,6 +3808,8 @@ AC_SUBST(LOCK_SRCS) AC_SUBST(LOCK_OBJS) AC_SUBST(JPEG_EXES) AC_SUBST(GL_EXES) +AC_SUBST(RETIRED_GL_EXES) +AC_SUBST(SUID_EXES) AC_SUBST(GL_UTIL_EXES) AC_SUBST(GL_MEN) AC_SUBST(GL_KLUDGE) @@ -3623,6 +3819,7 @@ AC_SUBST(GNOME24) AC_SUBST(GNOME22) AC_SUBST(NOGNOME) AC_SUBST(HACKDIR) +AC_SUBST(HACKDIR_FULL) AC_SUBST(GTK_DATADIR) AC_SUBST(PO_DATADIR) AC_SUBST(HACK_CONF_DIR) @@ -3928,8 +4125,9 @@ if test "$have_gl" = yes -a "$ac_have_mesa_gl" = yes ; then pgl="$preferred_mesagl" if test "$ac_mesagl_version" = unknown; then - warnL "Unable to determine the MesaGL version number!" - warn2 "Make sure you are using version $preferred_mesagl or newer." + true + # warnL "Unable to determine the MesaGL version number!" + # warn2 "Make sure you are using version $preferred_mesagl or newer." elif test \! "$ac_mesagl_version" -gt 2006; then warnL "MesaGL version number is $mgv --" @@ -4024,28 +4222,20 @@ if test "$with_shadow_req" = yes -a "$have_shadow" = no ; then warn 'Use of shadow passwords was requested, but they were not found.' fi +if test "$ac_macosx" = yes ; then + if test "$enable_locking" = yes ; then + warn "You have specified --enable-locking on MacOS X." + warn2 "THIS DOES NOT WORK! Don't do this!" + fi +fi + # You are in a twisty maze of namespaces and syntaxes, all alike. # Fuck the skull of Unix. # -eval bindir=${bindir} -eval bindir=${bindir} -eval bindir=${bindir} -eval bindir=${bindir} -eval bindir=${bindir} -eval bindir=${bindir} -eval HACKDIR=${HACKDIR} -eval HACKDIR=${HACKDIR} -eval HACKDIR=${HACKDIR} -eval HACKDIR=${HACKDIR} -eval HACKDIR=${HACKDIR} -eval HACKDIR=${HACKDIR} -eval HACK_CONF_DIR=${HACK_CONF_DIR} -eval HACK_CONF_DIR=${HACK_CONF_DIR} -eval HACK_CONF_DIR=${HACK_CONF_DIR} -eval HACK_CONF_DIR=${HACK_CONF_DIR} -eval HACK_CONF_DIR=${HACK_CONF_DIR} -eval HACK_CONF_DIR=${HACK_CONF_DIR} +bindir=`eval eval eval eval eval eval eval echo $bindir` +HACKDIR=`eval eval eval eval eval eval eval echo $HACKDIR` +HACK_CONF_DIR=`eval eval eval eval eval eval eval echo $HACK_CONF_DIR` # canonicalize slashes. bindir=`echo "${bindir}" | sed 's@/$@@;s@//*@/@g'` @@ -4083,7 +4273,7 @@ if test -z "$RPM_PACKAGE_VERSION" ; then if test \! -z "$rpmv" ; then rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` - rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` + rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/popsquares$@\1@p'` warning=no warnL "There is already an installed RPM of xscreensaver $rpmv" @@ -4106,6 +4296,33 @@ if test -z "$RPM_PACKAGE_VERSION" ; then fi fi +# Also warn if there's a Debian package installed. +# +debnames="xscreensaver xscreensaver-data xscreensaver-data-extra" +debv='' +for dpkg in $debnames ; do + if test -z "$debv"; then + debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'` + fi +done + +if test \! -z "$debv" ; then + debbdir=`dpkg -L $debnames 2>/dev/null | \ + sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'` + debhdir=`dpkg -L $debnames 2>/dev/null | \ + sed -n 's@^\(.*/\)popsquares$@\1@p'` + if test -z "$debbdir" ; then debbdir='???'; fi + if test -z "$debhdir" ; then debhdir='???'; fi + + warning=no + warnL "There is already an installed dpkg of xscreensaver" + warn2 "version \"$debv\" on this system." + echo "" + warn2 "The dpkg was installed in $debbdir," + warn2 "with demos in $debhdir." +fi + + if test "${bindir}" = "${HACKDIR}" ; then do_dir_warning=yes fi @@ -4137,6 +4354,7 @@ if test "$do_dir_warning" = no; then fi echo "User programs will be installed in ${bindir}/" echo "Screen savers will be installed in ${HACKDIR}/" - echo "Configuration will be installed in ${HACK_CONF_DIR}/" + echo "Configuration dialogs will be installed in ${HACK_CONF_DIR}/" + echo "System-wide default settings will be installed in ${APPDEFAULTS}/" echo '' fi