X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure;h=bbfafcef908a9963fe49a8bba4167318653bae96;hp=9873d74b8e52092117cba40d67cda11d34faed23;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=3f438031d610c7e15fd33876a879b97e290e05fb diff --git a/configure b/configure index 9873d74b..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 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 NEW_LOGIN_COMMAND NEW_LOGIN_COMMAND_P DEFAULT_IMAGES_P DEFAULT_IMAGE_DIRECTORY DEFAULT_TEXT_FILE 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 GTK_DATADIR PO_DATADIR 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. @@ -851,16 +851,22 @@ 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: --with-hackdir=DIR Where to install the hundreds of demo executables. Default: `PREFIX/libexec/xscreensaver/' --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. Except where noted, all of the --with options below can also take a directory argument: for example, `--with-motif=/opt/Motif'. That would @@ -919,6 +925,7 @@ Graphics options: --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.) @@ -1539,6 +1546,9 @@ echo "command line was: $0 $@" + + + @@ -1667,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; + + @@ -2836,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? @@ -5009,6 +5035,108 @@ _ACEOF fi done + +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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* 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 () +{ +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 @@ -7167,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 ############################################################################### # @@ -9729,6 +9866,11 @@ 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. @@ -9749,6 +9891,7 @@ fi ############################################################################### # # Handle the --with-configdir option +# Help for --with-x-app-defaults option added.. # ############################################################################### @@ -12143,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 @@ -12157,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 @@ -12213,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 ############################################################################### # @@ -12739,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 @@ -14387,7 +14595,6 @@ 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 - with_login_manager="$login_manager_tmp" else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -14695,6 +14902,7 @@ 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 @@ -14727,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 @@ -16112,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 @@ -16983,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 @@ -17811,6 +18021,10 @@ if test "$have_motif" = yes -a "$have_xpm" = yes ; then fi fi +if test "$XPM_LIBS" = "" ; then + XPM_LIBS=$(MINIXPM) +fi + ############################################################################### # @@ -18378,6 +18592,7 @@ 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 @@ -18389,6 +18604,102 @@ fi # 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" + + 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 -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="-lc $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_c_forkpty=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +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_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 + +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + +fi ############################################################################### # @@ -19317,9 +19628,9 @@ fi; case "$with_textfile" in /*) # absolute path - echo "$as_me:$LINENO: checking for image directory $with_textfile" >&5 -echo $ECHO_N "checking for image directory $with_textfile... $ECHO_C" >&6 - if test -d "$with_textfile" ; then + 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 @@ -19357,7 +19668,7 @@ echo "${ECHO_T}no" >&6 ;; *) - 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 @@ -19366,6 +19677,52 @@ 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 + + +# 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 + +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 +# 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") @@ -19664,6 +20021,9 @@ INCLUDES=`echo "$INCLUDES" | sed 's@ -I${prefix}/include@@g;'` + + + @@ -20400,11 +20760,13 @@ 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 @@ -20430,6 +20792,7 @@ s,@GNOME24@,$GNOME24,;t t s,@GNOME22@,$GNOME22,;t t s,@NOGNOME@,$NOGNOME,;t t s,@HACKDIR@,$HACKDIR,;t t +s,@HACKDIR_FULL@,$HACKDIR_FULL,;t t s,@GTK_DATADIR@,$GTK_DATADIR,;t t s,@PO_DATADIR@,$PO_DATADIR,;t t s,@HACK_CONF_DIR@,$HACK_CONF_DIR,;t t @@ -21580,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