X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure;h=bbfafcef908a9963fe49a8bba4167318653bae96;hp=61c6116d696658eb7d1080fc0a164842a51cb6cb;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=2d04c4f22466851aedb6ed0f2919d148f726b889 diff --git a/configure b/configure index 61c6116d..bbfafcef 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE EGREP PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL GETTEXT_PACKAGE RANLIB ac_ct_RANLIB ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB MKINSTALLDIRS pkg_config gnome_open_program gnome_url_show_program fortune_tmp INCLUDES PREFERRED_DEMO_PROGRAM ALL_DEMO_PROGRAMS SAVER_LIBS MOTIF_LIBS GTK_LIBS XML_LIBS JPEG_LIBS HACK_LIBS XPM_LIBS PTY_LIBS GL_LIBS GLE_LIBS XDPMS_LIBS PASSWD_LIBS INSTALL_SETUID SETUID_HACKS INSTALL_DIRS NEED_SETUID INSTALL_PAM OBJCC EXES_OSX SCRIPTS_OSX MEN_OSX PASSWD_SRCS PASSWD_OBJS XMU_SRCS XMU_OBJS XMU_LIBS SAVER_GL_SRCS SAVER_GL_OBJS SAVER_GL_LIBS LOCK_SRCS LOCK_OBJS JPEG_EXES GL_EXES GL_UTIL_EXES GL_MEN GL_KLUDGE GLE_EXES GLE_KLUDGE GNOME24 GNOME22 NOGNOME HACKDIR GNOME_DATADIR GLADE_DATADIR PO_DATADIR GNOME_PANELDIR HACK_CONF_DIR GTK_EXTRA_OBJS APPDEFAULTS DEPEND DEPEND_FLAGS DEPEND_DEFINES LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE EGREP PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL GETTEXT_PACKAGE RANLIB ac_ct_RANLIB ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB MKINSTALLDIRS login_manager_tmp pkg_config gnome_open_program gnome_url_show_program INCLUDES PREFERRED_DEMO_PROGRAM ALL_DEMO_PROGRAMS SAVER_LIBS MOTIF_LIBS GTK_LIBS XML_LIBS JPEG_LIBS HACK_LIBS XPM_LIBS PTY_LIBS GL_LIBS GLE_LIBS XDPMS_LIBS XINERAMA_LIBS PASSWD_LIBS INSTALL_SETUID SETUID_HACKS INSTALL_DIRS NEED_SETUID INSTALL_PAM HAVE_PAM_FAIL_DELAY NEW_LOGIN_COMMAND NEW_LOGIN_COMMAND_P DEFAULT_IMAGES_P DEFAULT_IMAGE_DIRECTORY DEFAULT_TEXT_FILE WITH_BROWSER OBJCC EXES_OSX SCRIPTS_OSX MEN_OSX PASSWD_SRCS PASSWD_OBJS XMU_SRCS XMU_OBJS XMU_LIBS SAVER_GL_SRCS SAVER_GL_OBJS SAVER_GL_LIBS LOCK_SRCS LOCK_OBJS JPEG_EXES GL_EXES GL_UTIL_EXES GL_MEN GL_KLUDGE GLE_EXES GLE_KLUDGE GNOME24 GNOME22 NOGNOME HACKDIR HACKDIR_FULL GTK_DATADIR PO_DATADIR HACK_CONF_DIR GTK_EXTRA_OBJS APPDEFAULTS DEPEND DEPEND_FLAGS DEPEND_DEFINES LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -348,7 +348,7 @@ libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' infodir='${prefix}/info' -mandir='${prefix}/man' +mandir=\${datadir}/man ac_prev= for ac_option @@ -818,6 +818,8 @@ For better control, use the options below. Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --x-includes=DIR X include files are in DIR @@ -845,24 +847,26 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - Screen locking options: - --enable-locking Compile in support for locking the display. --disable-locking Do not allow locking at all. + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that. + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -Installation options: + +Installation options: --with-hackdir=DIR Where to install the hundreds of demo executables. - Default: `PREFIX/lib/xscreensaver/' + Default: `PREFIX/libexec/xscreensaver/' --with-configdir=DIR Where to install the data files that describe each of the display modes to the GUI. - Default: `GTK_PREFIX/control-center/screensavers/' - or `PREFIX/lib/xscreensaver/config/', depending on - whether GTK is available. + Default: `PREFIX/share/xscreensaver/config/' + --with-x-app-defaults=DIR + Where to install xscreensaver configuration file. Except where noted, all of the --with options below can also take a directory argument: for example, `--with-motif=/opt/Motif'. That would @@ -878,7 +882,6 @@ at all. Screen blanking and idle-detection options: --with-sgi-ext Include support for the SGI SCREEN_SAVER extension. - --with-mit-ext Include support for the MIT-SCREEN-SAVER extension. --with-xidle-ext Include support for the XIDLE extension. --with-sgivc-ext Include support for the SGI-VIDEO-CONTROL extension. --with-dpms-ext Include support for the DPMS extension. @@ -889,10 +892,15 @@ Screen blanking and idle-detection options: --with-proc-interrupts Include support for consulting the /proc/interrupts file to notice keyboard activity. --with-pam Include support for PAM (Pluggable Auth Modules.) + --with-pam-service-name=NAME + NAME is the name of the PAM service that + xscreensaver will authenticate as. --with-kerberos Include support for Kerberos authentication. --with-shadow Include support for shadow password authentication. --with-passwd-helper Include support for an external password verification helper program. + --with-login-manager Put a "New Login" button on the unlock dialog that + runs a login manager such as gdmflexiserver. User interface options: @@ -914,11 +922,10 @@ Graphics options: --with-xshm-ext Include support for the Shared Memory extension. --with-xdbe-ext Include support for the DOUBLE-BUFFER extension. --with-readdisplay Include support for the XReadDisplay extension. - - --with-fortune=PROGRAM Some demos are able to run an external program and - display its text; this names the program to use by - default (though it can be overridden with X - resources.) Default is "/usr/games/fortune". + --with-image-directory=DIR By default, some demos may display random images + from this directory. + --with-text-file=FILE By default, some demos may display this file. + --with-browser=BROWSER Specify the browser to show help URL. --with-setuid-hacks Allow some demos to be installed `setuid root' (which is needed in order to ping other hosts.) @@ -1375,6 +1382,175 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "current directory: `pwd`" echo "command line was: $0 $@" + +############################################################################### +# +# Autoheader stuff +# +############################################################################### + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # After checking to see that --srcdir is correct (which AC_INIT does) @@ -1501,6 +1677,22 @@ perl_version_cmd='print $]' # +############################################################################### +# +# Handle the --with-x-app-defaults option HERE +# +############################################################################### + + +# Check whether --with-x-app-defaults or --without-x-app-defaults was given. +if test "${with_x_app_defaults+set}" = set; then + withval="$with_x_app_defaults" + ac_cv_x_app_defaults="$withval" +else + eval ac_x_app_defaults="$withval" +fi; + + @@ -2670,7 +2862,7 @@ fi if test -n "$GCC"; then echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5 echo "${ECHO_T}Turning on gcc compiler warnings." >&6 - 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? @@ -4843,9 +5035,13 @@ _ACEOF fi done -echo "$as_me:$LINENO: checking for struct icmp" >&5 -echo $ECHO_N "checking for struct icmp... $ECHO_C" >&6 -if test "${ac_cv_have_icmp+set}" = set; then + +for ac_func in setlocale +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -4854,34 +5050,132 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + int main () { -struct icmp i; - struct sockaddr s; - struct sockaddr_in si; - struct ip ip; - i.icmp_type = ICMP_ECHO; - i.icmp_code = 0; +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +echo "$as_me:$LINENO: checking for struct icmp" >&5 +echo $ECHO_N "checking for struct icmp... $ECHO_C" >&6 +if test "${ac_cv_have_icmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include +int +main () +{ +struct icmp i; + struct sockaddr s; + struct sockaddr_in si; + struct ip ip; + i.icmp_type = ICMP_ECHO; + i.icmp_code = 0; i.icmp_cksum = 0; i.icmp_id = 0; i.icmp_seq = 0; @@ -7001,6 +7295,15 @@ echo "$as_me:$LINENO: result: $ac_macosx" >&5 echo "${ECHO_T}$ac_macosx" >&6 +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" + echo "$as_me:$LINENO: result: adding \"$osx_crud\" to LDFLAGS" >&5 +echo "${ECHO_T}adding \"$osx_crud\" to LDFLAGS" >&6 + LDFLAGS="$LDFLAGS $osx_crud" + fi +fi ############################################################################### # @@ -7129,17 +7432,19 @@ fi GETTEXT_PACKAGE=xscreensaver + cat >>confdefs.h <<_ACEOF #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE "$GETTEXT_PACKAGE" _ACEOF -ALL_LINGUAS="ca da de es et fi fr hu it ja ko 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 no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -9551,23 +9856,21 @@ else fi; if test x"$with_hackdir" = xyes; then - HACKDIR='${exec_prefix}/lib/xscreensaver' + HACKDIR='${libexecdir}/xscreensaver' elif test x"$with_hackdir" = xno; then HACKDIR='${bindir}' else - # there must be a better way than this... - if test -z "`echo $with_hackdir | sed 's@^/.*@@'`" ; then - # absolute path - HACKDIR=$with_hackdir - else - # relative path - HACKDIR="\${exec_prefix}$with_hackdir" - fi + HACKDIR=$with_hackdir fi # canonicalize slashes. HACKDIR=`echo "${HACKDIR}" | sed 's@/$@@;s@//*@/@g'` +# Expand HACKDIR as HACKDIR_FULL +eval HACKDIR_FULL=${HACKDIR} +eval HACKDIR_FULL=${HACKDIR_FULL} +eval HACKDIR_FULL=${HACKDIR_FULL} + # This option used to be called --enable-subdir; make sure that is no longer # used, since configure brain-damagedly ignores unknown --enable options. @@ -9588,6 +9891,7 @@ fi ############################################################################### # # Handle the --with-configdir option +# Help for --with-x-app-defaults option added.. # ############################################################################### @@ -9603,8 +9907,7 @@ else fi; if test x"$with_configdir" = xyes; then - # filled in later... - HACK_CONF_DIR='' + HACK_CONF_DIR='${datadir}/xscreensaver/config' elif test x"$with_configdir" = xno; then echo "error: must be yes, or a pathname: --with-configdir=$with_configdir" exit 1 @@ -9758,30 +10061,30 @@ fi ############################################################################### # -# Check for the MIT-SCREEN-SAVER server extension. +# Check for the XIDLE server extension. # ############################################################################### -have_mit=no -with_mit_req=unspecified +have_xidle=no +with_xidle_req=unspecified -# Check whether --with-mit-ext or --without-mit-ext was given. -if test "${with_mit_ext+set}" = set; then - withval="$with_mit_ext" - with_mit="$withval"; with_mit_req="$withval" +# Check whether --with-xidle-ext or --without-xidle-ext was given. +if test "${with_xidle_ext+set}" = set; then + withval="$with_xidle_ext" + with_xidle="$withval"; with_xidle_req="$withval" else - with_mit=yes + with_xidle=yes fi; - case "$with_mit" in + case "$with_xidle" in yes) ;; no) ;; /*) - echo "$as_me:$LINENO: checking for MIT-SCREEN-SAVER headers" >&5 -echo $ECHO_N "checking for MIT-SCREEN-SAVER headers... $ECHO_C" >&6 - d=$with_mit/include + echo "$as_me:$LINENO: checking for XIDLE headers" >&5 +echo $ECHO_N "checking for XIDLE headers... $ECHO_C" >&6 + d=$with_xidle/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" echo "$as_me:$LINENO: result: $d" >&5 @@ -9791,9 +10094,9 @@ echo "${ECHO_T}$d" >&6 echo "${ECHO_T}not found ($d: no such directory)" >&6 fi - echo "$as_me:$LINENO: checking for MIT-SCREEN-SAVER libs" >&5 -echo $ECHO_N "checking for MIT-SCREEN-SAVER libs... $ECHO_C" >&6 - d=$with_mit/lib + echo "$as_me:$LINENO: checking for XIDLE libs" >&5 +echo $ECHO_N "checking for XIDLE libs... $ECHO_C" >&6 + d=$with_xidle/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" echo "$as_me:$LINENO: result: $d" >&5 @@ -9804,13 +10107,13 @@ echo "${ECHO_T}not found ($d: no such directory)" >&6 fi # replace the directory string with "yes". - with_mit_req="yes" - with_mit=$with_mit_req + with_xidle_req="yes" + with_xidle=$with_xidle_req ;; *) echo "" - echo "error: argument to --with-mit-ext must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-xidle-ext must be \"yes\", \"no\", or a directory." echo " If it is a directory, then \`DIR/include' will be added to" echo " the -I list, and \`DIR/lib' will be added to the -L list." exit 1 @@ -9818,16 +10121,16 @@ echo "${ECHO_T}not found ($d: no such directory)" >&6 esac -if test "$with_mit" = yes; then +if test "$with_xidle" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" - echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5 -echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then + echo "$as_me:$LINENO: checking for X11/extensions/xidle.h" >&5 +echo $ECHO_N "checking for X11/extensions/xidle.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_xidle_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -9838,7 +10141,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -9862,77 +10165,122 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_scrnsaver_h=yes + ac_cv_header_X11_extensions_xidle_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_scrnsaver_h=no +ac_cv_header_X11_extensions_xidle_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6 -if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then - have_mit=yes +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xidle_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xidle_h" >&6 +if test $ac_cv_header_X11_extensions_xidle_h = yes; then + have_xidle=yes + cat >>confdefs.h <<\_ACEOF +#define HAVE_XIDLE_EXTENSION 1 +_ACEOF + fi CPPFLAGS="$ac_save_CPPFLAGS" +elif test "$with_xidle" != no; then + echo "error: must be yes or no: --with-xidle-ext=$with_xidle" + exit 1 +fi - # Now check to see if it's really in the library; XF86Free-3.3 ships - # scrnsaver.h, but doesn't include the code in libXext.a, the idiots! - # - if test "$have_mit" = yes; then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" +############################################################################### +# +# Check for the SGI-VIDEO-CONTROL server extension. +# +############################################################################### + +have_sgivc=no +with_sgivc_req=unspecified + +# Check whether --with-sgivc-ext or --without-sgivc-ext was given. +if test "${with_sgivc_ext+set}" = set; then + withval="$with_sgivc_ext" + with_sgivc="$withval"; with_sgivc_req="$withval" +else + with_sgivc=yes +fi; + + + case "$with_sgivc" in + yes) ;; + no) ;; + + /*) + echo "$as_me:$LINENO: checking for SGI-VIDEO-CONTROL headers" >&5 +echo $ECHO_N "checking for SGI-VIDEO-CONTROL headers... $ECHO_C" >&6 + d=$with_sgivc/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + echo "$as_me:$LINENO: result: $d" >&5 +echo "${ECHO_T}$d" >&6 + else + echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 +echo "${ECHO_T}not found ($d: no such directory)" >&6 + fi + + echo "$as_me:$LINENO: checking for SGI-VIDEO-CONTROL libs" >&5 +echo $ECHO_N "checking for SGI-VIDEO-CONTROL libs... $ECHO_C" >&6 + d=$with_sgivc/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + echo "$as_me:$LINENO: result: $d" >&5 +echo "${ECHO_T}$d" >&6 + else + echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 +echo "${ECHO_T}not found ($d: no such directory)" >&6 + fi + + # replace the directory string with "yes". + with_sgivc_req="yes" + with_sgivc=$with_sgivc_req + ;; + + *) + echo "" + echo "error: argument to --with-sgivc-ext must be \"yes\", \"no\", or a directory." + echo " If it is a directory, then \`DIR/include' will be added to" + echo " the -I list, and \`DIR/lib' will be added to the -L list." + exit 1 + ;; + esac + +if test "$with_sgivc" = yes; then + + # first check for XSGIvc.h + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" fi - # note: $X_CFLAGS includes $x_includes CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" - fi - # note: $X_LIBS includes $x_libraries - LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - - echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXext" >&5 -echo $ECHO_N "checking for XScreenSaverRegister in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XScreenSaverRegister+set}" = set; then + echo "$as_me:$LINENO: checking for X11/extensions/XSGIvc.h" >&5 +echo $ECHO_N "checking for X11/extensions/XSGIvc.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_XSGIvc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XScreenSaverRegister (); -int -main () -{ -XScreenSaverRegister (); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -9946,501 +10294,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xext_XScreenSaverRegister=yes + ac_cv_header_X11_extensions_XSGIvc_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xext_XScreenSaverRegister=no +ac_cv_header_X11_extensions_XSGIvc_h=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverRegister" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverRegister" >&6 -if test $ac_cv_lib_Xext_XScreenSaverRegister = yes; then - true -else - have_mit=no +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XSGIvc_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XSGIvc_h" >&6 +if test $ac_cv_header_X11_extensions_XSGIvc_h = yes; then + have_sgivc=yes fi - - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - - if test "$have_mit" = no; then - # Fuck! Looks like XF86Free-3.3 actually puts it in XExExt instead - # of in Xext. Thank you master, may I have another. - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" - - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" - fi - # note: $X_CFLAGS includes $x_includes - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" - fi - # note: $X_LIBS includes $x_libraries - LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - - echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXExExt" >&5 -echo $ECHO_N "checking for XScreenSaverRegister in -lXExExt... $ECHO_C" >&6 -if test "${ac_cv_lib_XExExt_XScreenSaverRegister+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXExExt -lX11 -lXext -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XScreenSaverRegister (); -int -main () -{ -XScreenSaverRegister (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_XExExt_XScreenSaverRegister=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_XExExt_XScreenSaverRegister=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_XExExt_XScreenSaverRegister" >&5 -echo "${ECHO_T}$ac_cv_lib_XExExt_XScreenSaverRegister" >&6 -if test $ac_cv_lib_XExExt_XScreenSaverRegister = yes; then - have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXExExt" -else - true -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - fi - - if test "$have_mit" = no; then - # Double fuck! Looks like some versions of XFree86 (whichever version - # it is that comes with RedHat Linux 2.0 -- I can't find a version - # number) put this garbage in Xss instead of Xext. Thank you master, - # may I have another. - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" - - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" - fi - # note: $X_CFLAGS includes $x_includes - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" - fi - # note: $X_LIBS includes $x_libraries - LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - - echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXss" >&5 -echo $ECHO_N "checking for XScreenSaverRegister in -lXss... $ECHO_C" >&6 -if test "${ac_cv_lib_Xss_XScreenSaverRegister+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXss -lX11 -lXext -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XScreenSaverRegister (); -int -main () -{ -XScreenSaverRegister (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_Xss_XScreenSaverRegister=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xss_XScreenSaverRegister=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverRegister" >&5 -echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverRegister" >&6 -if test $ac_cv_lib_Xss_XScreenSaverRegister = yes; then - have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXss" -else - true -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - fi - - if test "$have_mit" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_MIT_SAVER_EXTENSION 1 -_ACEOF - - fi - - fi - -elif test "$with_mit" != no; then - echo "error: must be yes or no: --with-mit-ext=$with_mit" - exit 1 -fi - - -############################################################################### -# -# Check for the XIDLE server extension. -# -############################################################################### - -have_xidle=no -with_xidle_req=unspecified - -# Check whether --with-xidle-ext or --without-xidle-ext was given. -if test "${with_xidle_ext+set}" = set; then - withval="$with_xidle_ext" - with_xidle="$withval"; with_xidle_req="$withval" -else - with_xidle=yes -fi; - - - case "$with_xidle" in - yes) ;; - no) ;; - - /*) - echo "$as_me:$LINENO: checking for XIDLE headers" >&5 -echo $ECHO_N "checking for XIDLE headers... $ECHO_C" >&6 - d=$with_xidle/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - echo "$as_me:$LINENO: result: $d" >&5 -echo "${ECHO_T}$d" >&6 - else - echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 -echo "${ECHO_T}not found ($d: no such directory)" >&6 - fi - - echo "$as_me:$LINENO: checking for XIDLE libs" >&5 -echo $ECHO_N "checking for XIDLE libs... $ECHO_C" >&6 - d=$with_xidle/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - echo "$as_me:$LINENO: result: $d" >&5 -echo "${ECHO_T}$d" >&6 - else - echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 -echo "${ECHO_T}not found ($d: no such directory)" >&6 - fi - - # replace the directory string with "yes". - with_xidle_req="yes" - with_xidle=$with_xidle_req - ;; - - *) - echo "" - echo "error: argument to --with-xidle-ext must be \"yes\", \"no\", or a directory." - echo " If it is a directory, then \`DIR/include' will be added to" - echo " the -I list, and \`DIR/lib' will be added to the -L list." - exit 1 - ;; - esac - - -if test "$with_xidle" = yes; then - - ac_save_CPPFLAGS="$CPPFLAGS" - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" - fi - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - echo "$as_me:$LINENO: checking for X11/extensions/xidle.h" >&5 -echo $ECHO_N "checking for X11/extensions/xidle.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_xidle_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_xidle_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_X11_extensions_xidle_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xidle_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_xidle_h" >&6 -if test $ac_cv_header_X11_extensions_xidle_h = yes; then - have_xidle=yes - cat >>confdefs.h <<\_ACEOF -#define HAVE_XIDLE_EXTENSION 1 -_ACEOF - -fi - - - CPPFLAGS="$ac_save_CPPFLAGS" -elif test "$with_xidle" != no; then - echo "error: must be yes or no: --with-xidle-ext=$with_xidle" - exit 1 -fi - - -############################################################################### -# -# Check for the SGI-VIDEO-CONTROL server extension. -# -############################################################################### - -have_sgivc=no -with_sgivc_req=unspecified - -# Check whether --with-sgivc-ext or --without-sgivc-ext was given. -if test "${with_sgivc_ext+set}" = set; then - withval="$with_sgivc_ext" - with_sgivc="$withval"; with_sgivc_req="$withval" -else - with_sgivc=yes -fi; - - - case "$with_sgivc" in - yes) ;; - no) ;; - - /*) - echo "$as_me:$LINENO: checking for SGI-VIDEO-CONTROL headers" >&5 -echo $ECHO_N "checking for SGI-VIDEO-CONTROL headers... $ECHO_C" >&6 - d=$with_sgivc/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - echo "$as_me:$LINENO: result: $d" >&5 -echo "${ECHO_T}$d" >&6 - else - echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 -echo "${ECHO_T}not found ($d: no such directory)" >&6 - fi - - echo "$as_me:$LINENO: checking for SGI-VIDEO-CONTROL libs" >&5 -echo $ECHO_N "checking for SGI-VIDEO-CONTROL libs... $ECHO_C" >&6 - d=$with_sgivc/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - echo "$as_me:$LINENO: result: $d" >&5 -echo "${ECHO_T}$d" >&6 - else - echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5 -echo "${ECHO_T}not found ($d: no such directory)" >&6 - fi - - # replace the directory string with "yes". - with_sgivc_req="yes" - with_sgivc=$with_sgivc_req - ;; - - *) - echo "" - echo "error: argument to --with-sgivc-ext must be \"yes\", \"no\", or a directory." - echo " If it is a directory, then \`DIR/include' will be added to" - echo " the -I list, and \`DIR/lib' will be added to the -L list." - exit 1 - ;; - esac - - -if test "$with_sgivc" = yes; then - - # first check for XSGIvc.h - - ac_save_CPPFLAGS="$CPPFLAGS" - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" - fi - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - echo "$as_me:$LINENO: checking for X11/extensions/XSGIvc.h" >&5 -echo $ECHO_N "checking for X11/extensions/XSGIvc.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_XSGIvc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_XSGIvc_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_X11_extensions_XSGIvc_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XSGIvc_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XSGIvc_h" >&6 -if test $ac_cv_header_X11_extensions_XSGIvc_h = yes; then - have_sgivc=yes -fi - + CPPFLAGS="$ac_save_CPPFLAGS" @@ -11196,7 +11070,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6 if test $ac_cv_lib_Xinerama_XineramaQueryScreens = yes; then - have_xinerama=yes; SAVER_LIBS="$SAVER_LIBS -lXinerama" + have_xinerama=yes; XINERAMA_LIBS="-lXinerama" else true fi @@ -12412,6 +12286,13 @@ fi; 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 echo "$as_me:$LINENO: checking whether /proc/interrupts contains keyboard data" >&5 echo $ECHO_N "checking whether /proc/interrupts contains keyboard data... $ECHO_C" >&6 if test "${ac_cv_have_proc_interrupts+set}" = set; then @@ -12426,6 +12307,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_have_proc_interrupts" >&5 echo "${ECHO_T}$ac_cv_have_proc_interrupts" >&6 have_proc_interrupts=$ac_cv_have_proc_interrupts + fi if test "$have_proc_interrupts" = yes; then cat >>confdefs.h <<\_ACEOF @@ -12482,43 +12364,26 @@ fi ############################################################################### # -# The --enable-vt-locking option +# Whether to allow root password to unblank. # ############################################################################### +# Check whether --enable-root-passwd or --disable-root-passwd was given. +if test "${enable_root_passwd+set}" = set; then + enableval="$enable_root_passwd" + enable_root_passwd="$enableval" +else + enable_root_passwd=yes +fi; +if test "$enable_root_passwd" = yes; then + cat >>confdefs.h <<\_ACEOF +#define ALLOW_ROOT_PASSWD 1 +_ACEOF -#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 - + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi ############################################################################### # @@ -12551,6 +12416,15 @@ else fi; +# Check whether --with-pam_service_name or --without-pam_service_name was given. +if test "${with_pam_service_name+set}" = set; then + withval="$with_pam_service_name" + pam_service_name="$withval" +else + pam_service_name="xscreensaver" +fi; + + case "$with_pam" in yes) ;; no) ;; @@ -12662,6 +12536,11 @@ echo "${ECHO_T}$ac_cv_pam" >&6 #define HAVE_PAM 1 _ACEOF + cat >>confdefs.h <<_ACEOF +#define PAM_SERVICE_NAME "$pam_service_name" +_ACEOF + + PASSWD_LIBS="${PASSWD_LIBS} -lpam" # libpam typically requires dlopen and dlsym. On FreeBSD, @@ -12994,6 +12873,80 @@ echo "${ECHO_T}two arguments" >&6 echo "$as_me:$LINENO: result: unknown" >&5 echo "${ECHO_T}unknown" >&6 fi + +# Check pam_fail_delay + echo "$as_me:$LINENO: checking pam_fail_delay in -lpam" >&5 +echo $ECHO_N "checking pam_fail_delay in -lpam... $ECHO_C" >&6 + if test "${ac_cv_pam_fail_delay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="-lpam" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +pam_handle_t *pamh = 0; + unsigned int usec = 1; + int status = pam_fail_delay (pamh, usec); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_pam_fail_delay=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_pam_fail_delay=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_pam_fail_delay=$ac_pam_fail_delay, + LD_FLAGS=$ac_save_LDFLAGS +fi + + + if test "$ac_pam_fail_delay" = yes ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define HAVE_PAM_FAIL_DELAY 1 +_ACEOF + + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + fi fi @@ -14600,6 +14553,122 @@ _ACEOF esac +############################################################################### +# +# Check for a login manager for a "New Login" button on the lock dialog. +# Usually this will be "/usr/bin/gdmflexiserver". +# +############################################################################### + +have_login_manager=no +with_login_manager_req=unspecified +default_login_manager='gdmflexiserver -l' + + +# Check whether --with-login-manager or --without-login-manager was given. +if test "${with_login_manager+set}" = set; then + withval="$with_login_manager" + with_login_manager="$withval"; with_login_manager_req="$withval" +else + with_login_manager=no +fi; +# no HANDLE_X_PATH_ARG for this one + +if test "$enable_locking" = no ; then + with_login_manager_req=no + with_login_manager=no +fi + +if test -n "$with_login_manager_req" ; then + ac_cv_login_manager_program="" + + if test "$with_login_manager_req" = "yes" ; then + with_login_manager_req=$default_login_manager + fi + + case "$with_login_manager_req" in + /*) + # absolute path + set dummy $with_login_manager_req ; login_manager_tmp=$2 + echo "$as_me:$LINENO: checking for $login_manager_tmp" >&5 +echo $ECHO_N "checking for $login_manager_tmp... $ECHO_C" >&6 + if test -x "$login_manager_tmp" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + 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 + # Extract the first word of "$login_manager_tmp", so it can be a program name with args. +set dummy $login_manager_tmp; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_login_manager_tmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $login_manager_tmp in + [\\/]* | ?:[\\/]*) + ac_cv_path_login_manager_tmp="$login_manager_tmp" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_login_manager_tmp="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +login_manager_tmp=$ac_cv_path_login_manager_tmp + +if test -n "$login_manager_tmp"; then + echo "$as_me:$LINENO: result: $login_manager_tmp" >&5 +echo "${ECHO_T}$login_manager_tmp" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + 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" + +elif test -n "$ac_cv_login_manager_program"; then + echo "$as_me:$LINENO: result: checking for login_manager... (cached) $ac_cv_login_manager_program" >&5 +echo "${ECHO_T}checking for login_manager... (cached) $ac_cv_login_manager_program" >&6 +fi + +NEW_LOGIN_COMMAND_P='' +NEW_LOGIN_COMMAND="$ac_cv_login_manager_program" + +if test -z "$NEW_LOGIN_COMMAND" ; then + NEW_LOGIN_COMMAND="$default_login_manager" + NEW_LOGIN_COMMAND_P='! ' +fi + + + ############################################################################### # # Check for -lgtk (and Gnome stuff) @@ -14833,15 +14902,15 @@ fi echo "$as_me:$LINENO: result: $ac_cv_gtk_config_libs" >&5 echo "${ECHO_T}$ac_cv_gtk_config_libs" >&6 fi + ac_gtk_config_cflags=$ac_cv_gtk_config_cflags ac_gtk_config_libs=$ac_cv_gtk_config_libs GTK_EXTRA_OBJS="" - GNOME_DATADIR="" - GNOME_PANELDIR='$(GNOME_PANELDIR2)' + GTK_DATADIR="" if test "$have_gtk" = yes; then - GNOME_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` - GNOME_DATADIR="$GNOME_DATADIR/share" + GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + GTK_DATADIR="$GTK_DATADIR/share" fi if test "$have_gtk" = yes; then @@ -14866,6 +14935,7 @@ fi # Check for the various Gnome help and URL loading programs. # +WITH_BROWSER=gnome-open if test "$have_gtk" = yes; then for ac_prog in gnome-open do @@ -16251,7 +16321,7 @@ if test "${ac_cv_mesagl_version_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.$ac_ext < #ifndef MESA_MAJOR_VERSION @@ -17122,6 +17192,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_gdk_pixbuf_config_libs" >&5 echo "${ECHO_T}$ac_cv_gdk_pixbuf_config_libs" >&6 fi + ac_gdk_pixbuf_config_cflags=$ac_cv_gdk_pixbuf_config_cflags ac_gdk_pixbuf_config_libs=$ac_cv_gdk_pixbuf_config_libs @@ -17950,6 +18021,10 @@ if test "$have_motif" = yes -a "$have_xpm" = yes ; then fi fi +if test "$XPM_LIBS" = "" ; then + XPM_LIBS=$(MINIXPM) +fi + ############################################################################### # @@ -18277,7 +18352,8 @@ fi ############################################################################### # -# Check for pty support for 'phosphor' +# Check for pty support: this allows 'phosphor' and 'apple2' +# to run curses-based programs, or be used as terminal windows. # ############################################################################### @@ -18418,22 +18494,119 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" + + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + + echo "$as_me:$LINENO: checking for forkpty in -lutil" >&5 +echo $ECHO_N "checking for forkpty in -lutil... $ECHO_C" >&6 +if test "${ac_cv_lib_util_forkpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char forkpty (); +int +main () +{ +forkpty (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_forkpty=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_lib_util_forkpty=no fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_util_forkpty" >&5 +echo "${ECHO_T}$ac_cv_lib_util_forkpty" >&6 +if test $ac_cv_lib_util_forkpty = yes; then + PTY_LIBS="-lutil" + ac_have_forkpty=yes + cat >>confdefs.h <<\_ACEOF +#define HAVE_FORKPTY 1 _ACEOF fi -done + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" +if test "$ac_have_forkpty" != yes ; then + # we don't need (or have) -lutil on MacOS 10.4.2... + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" @@ -18450,13 +18623,13 @@ done # note: $X_LIBS includes $x_libraries LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - echo "$as_me:$LINENO: checking for forkpty in -lutil" >&5 -echo $ECHO_N "checking for forkpty in -lutil... $ECHO_C" >&6 -if test "${ac_cv_lib_util_forkpty+set}" = set; then + echo "$as_me:$LINENO: checking for forkpty in -lc" >&5 +echo $ECHO_N "checking for forkpty in -lc... $ECHO_C" >&6 +if test "${ac_cv_lib_c_forkpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lutil $LIBS" +LIBS="-lc $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18501,22 +18674,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_util_forkpty=yes + ac_cv_lib_c_forkpty=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_util_forkpty=no +ac_cv_lib_c_forkpty=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_util_forkpty" >&5 -echo "${ECHO_T}$ac_cv_lib_util_forkpty" >&6 -if test $ac_cv_lib_util_forkpty = yes; then - PTY_LIBS="-lutil" - cat >>confdefs.h <<\_ACEOF +echo "$as_me:$LINENO: result: $ac_cv_lib_c_forkpty" >&5 +echo "${ECHO_T}$ac_cv_lib_c_forkpty" >&6 +if test $ac_cv_lib_c_forkpty = yes; then + PTY_LIBS="" + cat >>confdefs.h <<\_ACEOF #define HAVE_FORKPTY 1 _ACEOF @@ -18526,7 +18699,7 @@ fi LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - +fi ############################################################################### # @@ -19356,229 +19529,199 @@ fi ############################################################################### # -# Check for a program to generate random text. -# -# Zippy is funnier than the idiocy generally spat out by `fortune', -# so first see if "fortune zippy" works. Else, use plain "fortune". -# -# We used to dig around in Emacs to look for the "yow" program, but -# most people who have Emacs also have "fortune zippy", so nevermind. +# Check for a directory full of images to use as the default value +# of the "imageDirectory" preference. # ############################################################################### -with_fortune_req="" +have_imagedir=no +with_imagedir_req=unspecified + -# Check whether --with-fortune or --without-fortune was given. -if test "${with_fortune+set}" = set; then - withval="$with_fortune" - with_fortune_req="$withval"; with_fortune="$withval" +# Check whether --with-image-directory or --without-image-directory was given. +if test "${with_image_directory+set}" = set; then + withval="$with_image_directory" + with_imagedir="$withval"; with_imagedir_req="$withval" else - with_fortune=yes + with_imagedir=yes fi; +# no HANDLE_X_PATH_ARG for this one -if test "$with_fortune" = no || test "$with_fortune" = yes ; then - with_fortune="" - with_fortune_req="" -fi - -if test -n "$with_fortune_req" ; then - ac_cv_fortune_program="" - case "$with_fortune_req" in - /*) - - set dummy $with_fortune_req ; fortune_tmp=$2 - echo "$as_me:$LINENO: checking for $fortune_tmp" >&5 -echo $ECHO_N "checking for $fortune_tmp... $ECHO_C" >&6 - if test -x "$fortune_tmp" ; then - echo "$as_me:$LINENO: result: yes" >&5 +case "$with_imagedir" in + /*) + # absolute path + echo "$as_me:$LINENO: checking for image directory $with_imagedir" >&5 +echo $ECHO_N "checking for image directory $with_imagedir... $ECHO_C" >&6 + if test -d "$with_imagedir" ; then + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + with_imagedir="" + fi + ;; + yes) + with_imagedir="" + + #### Could use some more defaults here... + for dd in \ + "/usr/share/backgrounds/images/" \ + "/usr/share/wallpapers/" \ + "/Library/Desktop Pictures/" \ + ; do + if test -z "$with_imagedir"; then + echo "$as_me:$LINENO: checking for image directory $dd" >&5 +echo $ECHO_N "checking for image directory $dd... $ECHO_C" >&6 + if test -d "$dd" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + with_imagedir="$dd" + else + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - with_fortune="" + fi fi - ;; - *) - set dummy $with_fortune_req ; fortune_tmp=$2 - # don't cache - unset ac_cv_path_fortune_tmp - # Extract the first word of "$fortune_tmp", so it can be a program name with args. -set dummy $fortune_tmp; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_fortune_tmp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $fortune_tmp in - [\\/]* | ?:[\\/]*) - ac_cv_path_fortune_tmp="$fortune_tmp" # Let the user override the test with a path. + done + + ;; + no) + with_imagedir="" ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_fortune_tmp="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + *) + echo "error: must be an absolute path: --with-image-directory=$with_imagedir_req" + exit 1 ;; esac -fi -fortune_tmp=$ac_cv_path_fortune_tmp +ac_cv_imagedir="$with_imagedir" -if test -n "$fortune_tmp"; then - echo "$as_me:$LINENO: result: $fortune_tmp" >&5 -echo "${ECHO_T}$fortune_tmp" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +DEFAULT_IMAGES_P='True' +DEFAULT_IMAGE_DIRECTORY="$ac_cv_imagedir" + +if test -z "$DEFAULT_IMAGE_DIRECTORY" ; then + DEFAULT_IMAGES_P='False' fi - if test -z "$fortune_tmp" ; then - with_fortune="" - fi - ;; - esac - ac_cv_fortune_program="$with_fortune" -elif test -n "$ac_cv_fortune_program"; then - echo "$as_me:$LINENO: result: checking for fortune... (cached) $ac_cv_fortune_program" >&5 -echo "${ECHO_T}checking for fortune... (cached) $ac_cv_fortune_program" >&6 -fi +############################################################################### +# +# Pick a text file to use as the default of the "textFile" preference. +# Any old file will do, but preferably one that will make interesting +# shapes when displayed by "starwars" and "fontglide". +# +############################################################################### -unset ac_cv_path_fortune_tmp -unset fortune_tmp +have_textfile=no +with_textfile_req=unspecified -if test -z "$ac_cv_fortune_program" ; then - # first look for fortune in /usr/games/ (and use absolute path) - for ac_prog in fortune -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_fortune_tmp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-text-file or --without-text-file was given. +if test "${with_text_file+set}" = set; then + withval="$with_text_file" + with_textfile="$withval"; with_textfile_req="$withval" else - case $fortune_tmp in - [\\/]* | ?:[\\/]*) - ac_cv_path_fortune_tmp="$fortune_tmp" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in "/usr/games" -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_fortune_tmp="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + with_textfile=yes +fi; +# no HANDLE_X_PATH_ARG for this one +case "$with_textfile" in + /*) + # absolute path + echo "$as_me:$LINENO: checking for text file $with_textfile" >&5 +echo $ECHO_N "checking for text file $with_textfile... $ECHO_C" >&6 + if test -f "$with_textfile" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + with_textfile="" + fi ;; -esac -fi -fortune_tmp=$ac_cv_path_fortune_tmp - -if test -n "$fortune_tmp"; then - echo "$as_me:$LINENO: result: $fortune_tmp" >&5 -echo "${ECHO_T}$fortune_tmp" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 + yes) + with_textfile="" + + #### Could use some more defaults here... + for f in \ + "/usr/X11R6/lib/X11/doc/README" \ + "/usr/share/doc/xserver-common/copyright" \ + "/usr/X11R6/README" \ + ; do + if test -z "$with_textfile"; then + echo "$as_me:$LINENO: checking for text file $f" >&5 +echo $ECHO_N "checking for text file $f... $ECHO_C" >&6 + if test -f "$f" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + with_textfile="$f" + else + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 -fi + fi + fi + done - test -n "$fortune_tmp" && break -done + ;; + no) + with_textfile="" + ;; + *) + echo "error: must be an absolute path: --with-text-file=$with_textfile_req" + exit 1 + ;; +esac +ac_cv_textfile="$with_textfile" - # if it's not there, look on $PATH (and don't use absolute path) - if test -z "$fortune_tmp" ; then - for ac_prog in fortune -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_fortune_tmp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$fortune_tmp"; then - ac_cv_prog_fortune_tmp="$fortune_tmp" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_fortune_tmp="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done +DEFAULT_TEXT_FILE="$ac_cv_textfile" -fi -fi -fortune_tmp=$ac_cv_prog_fortune_tmp -if test -n "$fortune_tmp"; then - echo "$as_me:$LINENO: result: $fortune_tmp" >&5 -echo "${ECHO_T}$fortune_tmp" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - test -n "$fortune_tmp" && break -done +############################################################################### +# +# Check the browser to see help URL +# +############################################################################### - fi +have_browser=no +with_browser_req=unspecified - # if we didn't find anything, then just assume /usr/games/ - if test -z "$fortune_tmp" ; then - fortune_tmp="/usr/games/fortune" - fi - ac_cv_fortune_program="$fortune_tmp" +# Check whether --with-browser or --without-browser was given. +if test "${with_browser+set}" = set; then + withval="$with_browser" + with_browser="$withval"; with_browser_req="$withval" +else + with_browser=no +fi; +# no HANDLE_X_PATH_ARG for this one - # now check to see whether "fortune zippy" works. - # - fortune_tmp="$fortune_tmp zippy" - echo "$as_me:$LINENO: checking for zippy quotes" >&5 -echo $ECHO_N "checking for zippy quotes... $ECHO_C" >&6 - if ( $fortune_tmp >/dev/null 2>&1 ); then - ac_cv_fortune_program="$fortune_tmp" - echo "$as_me:$LINENO: result: $fortune_tmp" >&5 -echo "${ECHO_T}$fortune_tmp" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 +case "$with_browser" in + no ) + ;; + * ) + WITH_BROWSER=$with_browser + gnome_open_program=$with_browser + echo "$as_me:$LINENO: checking for browser $with_browser" >&5 +echo $ECHO_N "checking for browser $with_browser... $ECHO_C" >&6 + with_browser_fullpath=`which $with_browser 2>/dev/null` + case $with_browser_fullpath in + /* ) + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + have_browser=yes + ;; + * ) + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - fi - -fi - -unset ac_cv_path_fortune_tmp -unset fortune_tmp - -cat >>confdefs.h <<_ACEOF -#define FORTUNE_PROGRAM "$ac_cv_fortune_program" -_ACEOF - - +# 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" ############################################################################### # @@ -19773,43 +19916,12 @@ else fi -# Now that we know whether we have Gnome, we can decide where the XML -# config files get installed. -# -if test -z "$HACK_CONF_DIR" ; then - if test -n "$GNOME_DATADIR" ; then - HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers' - else - HACK_CONF_DIR='${prefix}/lib/xscreensaver/config' - fi -fi - - - -# After computing $HACK_CONF_DIR, make sure $GLADE_DATADIR has a value -# so that we know where to install the Gtk pixmaps. -# -# It should usually be "/usr/share/pixmaps/", but we can't just use -# "$(prefix)/share/pixmaps" because that would usually result in -# "/usr/X11R6/share/pixmaps/", which is wrong. It needs to be the -# Gtk prefix, not the overall prefix. -# -if test -n "$GNOME_DATADIR" ; then - GLADE_DATADIR='$(GNOME_DATADIR)/xscreensaver' -elif test "$have_gtk" = yes; then - GLADE_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` - GLADE_DATADIR="$GLADE_DATADIR/share/xscreensaver" -else - GLADE_DATADIR='' -fi - - # Set PO_DATADIR to something sensible. # echo "$as_me:$LINENO: checking for locale directory" >&5 echo $ECHO_N "checking for locale directory... $ECHO_C" >&6 -if test -n "$GNOME_DATADIR" ; then - PO_DATADIR="$GNOME_DATADIR" +if test -n "$GTK_DATADIR" ; then + PO_DATADIR="$GTK_DATADIR" elif test "$have_gtk" = yes; then PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` PO_DATADIR="$PO_DATADIR/share" @@ -19901,6 +20013,13 @@ INCLUDES=`echo "$INCLUDES" | sed 's@ -I${prefix}/include@@g;'` + + + + + + + @@ -20616,10 +20735,10 @@ s,@INTLOBJS@,$INTLOBJS,;t t s,@POFILES@,$POFILES,;t t s,@POSUB@,$POSUB,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t +s,@login_manager_tmp@,$login_manager_tmp,;t t s,@pkg_config@,$pkg_config,;t t s,@gnome_open_program@,$gnome_open_program,;t t s,@gnome_url_show_program@,$gnome_url_show_program,;t t -s,@fortune_tmp@,$fortune_tmp,;t t s,@INCLUDES@,$INCLUDES,;t t s,@PREFERRED_DEMO_PROGRAM@,$PREFERRED_DEMO_PROGRAM,;t t s,@ALL_DEMO_PROGRAMS@,$ALL_DEMO_PROGRAMS,;t t @@ -20634,12 +20753,20 @@ s,@PTY_LIBS@,$PTY_LIBS,;t t s,@GL_LIBS@,$GL_LIBS,;t t s,@GLE_LIBS@,$GLE_LIBS,;t t s,@XDPMS_LIBS@,$XDPMS_LIBS,;t t +s,@XINERAMA_LIBS@,$XINERAMA_LIBS,;t t s,@PASSWD_LIBS@,$PASSWD_LIBS,;t t s,@INSTALL_SETUID@,$INSTALL_SETUID,;t t s,@SETUID_HACKS@,$SETUID_HACKS,;t t s,@INSTALL_DIRS@,$INSTALL_DIRS,;t t s,@NEED_SETUID@,$NEED_SETUID,;t t s,@INSTALL_PAM@,$INSTALL_PAM,;t t +s,@HAVE_PAM_FAIL_DELAY@,$HAVE_PAM_FAIL_DELAY,;t t +s,@NEW_LOGIN_COMMAND@,$NEW_LOGIN_COMMAND,;t t +s,@NEW_LOGIN_COMMAND_P@,$NEW_LOGIN_COMMAND_P,;t t +s,@DEFAULT_IMAGES_P@,$DEFAULT_IMAGES_P,;t t +s,@DEFAULT_IMAGE_DIRECTORY@,$DEFAULT_IMAGE_DIRECTORY,;t t +s,@DEFAULT_TEXT_FILE@,$DEFAULT_TEXT_FILE,;t t +s,@WITH_BROWSER@,$WITH_BROWSER,;t t s,@OBJCC@,$OBJCC,;t t s,@EXES_OSX@,$EXES_OSX,;t t s,@SCRIPTS_OSX@,$SCRIPTS_OSX,;t t @@ -20665,10 +20792,9 @@ s,@GNOME24@,$GNOME24,;t t s,@GNOME22@,$GNOME22,;t t s,@NOGNOME@,$NOGNOME,;t t s,@HACKDIR@,$HACKDIR,;t t -s,@GNOME_DATADIR@,$GNOME_DATADIR,;t t -s,@GLADE_DATADIR@,$GLADE_DATADIR,;t t +s,@HACKDIR_FULL@,$HACKDIR_FULL,;t t +s,@GTK_DATADIR@,$GTK_DATADIR,;t t s,@PO_DATADIR@,$PO_DATADIR,;t t -s,@GNOME_PANELDIR@,$GNOME_PANELDIR,;t t s,@HACK_CONF_DIR@,$HACK_CONF_DIR,;t t s,@GTK_EXTRA_OBJS@,$GTK_EXTRA_OBJS,;t t s,@APPDEFAULTS@,$APPDEFAULTS,;t t @@ -21379,10 +21505,6 @@ if test "$with_sgi_req" = yes -a "$have_sgi" = no ; then warn 'The SGI saver extension was requested, but was not found.' fi -if test "$with_mit_req" = yes -a "$have_mit" = no ; then - warn 'The MIT saver extension was requested, but was not found.' -fi - if test "$with_xidle_req" = yes -a "$have_xidle" = no ; then warn 'The XIdle extension was requested, but was not found.' fi @@ -21691,13 +21813,6 @@ if test "$with_readdisplay_req" = yes -a "$have_readdisplay" = no ; then warn 'Use of XReadDisplay was requested, but it was not found.' fi -if test -n "$with_fortune_req"; then - if test "$with_fortune_req" != "$ac_cv_fortune_program" ; then - warnL "$with_fortune_req was requested as the Fortune program," - warn2 "but was not found. The default will be used instead." - fi -fi - if test "$with_kerberos_req" = yes -a "$have_kerberos" = no ; then warn 'Use of Kerberos was requested, but it was not found.' fi @@ -21758,40 +21873,45 @@ done do_dir_warning=no -# Now let's see if there's a previous RPM version already installed. Blargh! +# Now let's warn if there's a previous RPM version already installed. +# But don't bother with this test if we are currently *building* an RPM. -# M4 sucks!! +if test -z "$RPM_PACKAGE_VERSION" ; then -rpmv=`(rpm -qv xscreensaver) 2>/dev/null | \ - sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'` + rpmnames="xscreensaver xscreensaver-base xscreensaver-extras" + # M4 sucks!! -if test \! -z "$rpmv" ; then - rpmbdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` - rpmhdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/attraction$@\1@p'` + rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ + sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ + head -1` - warning=no - warnL "There is already an installed RPM of xscreensaver $rpmv" - warn2 "on this system. You might want to remove it (with" - warn2 '"rpm -ve xscreensaver") before running "make install"' - warn2 "from this directory." - echo "" - warn2 "Alternately, you could build this version of xscreensaver" - warn2 'as an RPM, and then install that. An "xscreensaver.spec"' - warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' - warn2 "See the RPM documentation for more info." - echo "" - if test "$rpmbdir" = "$rpmhdir" ; then - warn2 "The RPM version was installed in $rpmbdir/." - do_dir_warning=yes - else - warn2 "The RPM version was installed in $rpmbdir/," - warn2 "with demos in $rpmhdir/." + 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'` + + warning=no + warnL "There is already an installed RPM of xscreensaver $rpmv" + warn2 'on this system. You might want to remove it ("rpm -ve")' + warn2 'before running "make install" in this directory.' + echo "" + warn2 "Alternately, you could build this version of xscreensaver" + warn2 'as an RPM, and then install that. An "xscreensaver.spec"' + warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' + warn2 "See the RPM documentation for more info." + echo "" + + if test "$rpmbdir" = "$rpmhdir" ; then + warn2 "The RPM version was installed in $rpmbdir/." + do_dir_warning=yes + else + warn2 "The RPM version was installed in $rpmbdir/," + warn2 "with demos in $rpmhdir/." + fi fi fi - if test "${bindir}" = "${HACKDIR}" ; then do_dir_warning=yes fi @@ -21823,6 +21943,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 "Hack configurations will be installed in ${HACK_CONF_DIR}/" + echo "Saver configuration will be installed in ${APPDEFAULTS}/" echo '' fi