X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure;h=fc5b9fddab278a82f224ca3a785a6277a009cb99;hb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;hp=f38b7fc7e284b89dd7ca4c3615dbcdb1b43ae80a;hpb=4cecfc89e5e889c7232693897c06168fb378bd5c;p=xscreensaver diff --git a/configure b/configure index f38b7fc7..fc5b9fdd 100755 --- a/configure +++ b/configure @@ -896,9 +896,7 @@ Graphics options: demos, which will make it possible for them to read GIF, JPEG, and PNG files as well. (The path here is ignored if GTK 2.x is being used.) - --with-jpeg Include support for the JPEG library in some demos. - (If this library is available, webcollage will be a - . lot faster.) + --with-jpeg Include support for the JPEG library. --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. @@ -1315,6 +1313,18 @@ done +############################################################################### +# +# Function to figure out how to turn off Objective C on MacOS X. +# (We have to do this to work around an Apple-specific gcc bug.) +# +############################################################################### + + + + + + ############################################################################### # # Function to figure out how to create directory trees. @@ -2425,6 +2435,32 @@ echo "${ECHO_T}Disabling C++ comments in ANSI C code." >&6 fi fi +if test -n "$GCC"; then + if test -n "$GCC"; then + echo "$as_me:$LINENO: checking whether gcc accepts -no-cpp-precomp" >&5 +echo $ECHO_N "checking whether gcc accepts -no-cpp-precomp... $ECHO_C" >&6 +if test "${ac_cv_gcc_accepts_no_cpp_precomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if ( ( gcc -E -no-cpp-precomp - /dev/null ) 2>&1 | \ + grep unrecognized >/dev/null ); then + ac_cv_gcc_accepts_no_cpp_precomp=no + else + ac_cv_gcc_accepts_no_cpp_precomp=yes + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_gcc_accepts_no_cpp_precomp" >&5 +echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp_precomp" >&6 + ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" + fi + + if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then + echo "$as_me:$LINENO: result: Disabling Objective C extensions in ANSI C code." >&5 +echo "${ECHO_T}Disabling Objective C extensions in ANSI C code." >&6 + CC="$CC -no-cpp-precomp" + fi + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6014,7 +6050,7 @@ case "$host" in # if test -f /usr/dt/include/Xm/Xm.h ; then X_CFLAGS="$X_CFLAGS -I/usr/dt/include" - X_LIBS="$X_LIBS -L/usr/dt/lib -R:/usr/dt/lib" + MOTIF_LIBS="$MOTIF_LIBS -L/usr/dt/lib -R/usr/dt/lib" # Some versions of Slowlaris Motif require -lgen. But not all. Why? echo "$as_me:$LINENO: checking for regcmp in -lgen" >&5 @@ -6073,10 +6109,20 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_gen_regcmp" >&5 echo "${ECHO_T}$ac_cv_lib_gen_regcmp" >&6 if test $ac_cv_lib_gen_regcmp = yes; then - X_LIBS="$X_LIBS -lgen" + MOTIF_LIBS="$MOTIF_LIBS -lgen" fi fi + + ;; + *-darwin*) + + # On MacOS X (10.x with "fink"), many things are under /sw/. + # + if test -d /sw/include ; then + X_CFLAGS="-I/sw/include $X_CFLAGS" + X_LIBS="-L/sw/lib $X_LIBS" + fi ;; esac echo "$as_me:$LINENO: checking for XPointer" >&5 @@ -9316,6 +9362,7 @@ else #line $LINENO "configure" #include "confdefs.h" #include + #include #include _ACEOF @@ -10369,12 +10416,115 @@ elif test "$with_xf86gamma" != no; then fi +############################################################################### +# +# Check for XF86MiscSetGrabKeysState (but only bother if we are already +# using other XF86 stuff.) +# +############################################################################### + +have_xf86miscsetgrabkeysstate=no +if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then + + 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 XF86MiscSetGrabKeysState in -lXxf86misc" >&5 +echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86misc -lXext -lX11 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "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 XF86MiscSetGrabKeysState (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +XF86MiscSetGrabKeysState (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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_Xxf86misc_XF86MiscSetGrabKeysState=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6 +if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then + have_xf86miscsetgrabkeysstate=yes +else + true +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + if test "$have_xf86miscsetgrabkeysstate" = yes ; then + SAVER_LIBS="$SAVER_LIBS -lXxf86misc" + cat >>confdefs.h <<\_ACEOF +#define HAVE_XF86MISCSETGRABKEYSSTATE 1 +_ACEOF + + fi +fi + + ############################################################################### # # Check for HP XHPDisableReset and XHPEnableReset. # ############################################################################### +echo "$as_me:$LINENO: checking for XHPDisableReset in X11/XHPlib.h" >&5 +echo $ECHO_N "checking for XHPDisableReset in X11/XHPlib.h... $ECHO_C" >&6 ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -10394,6 +10544,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | _ACEOF SAVER_LIBS="-lXhp11 $SAVER_LIBS" + 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 fi rm -f conftest* @@ -10997,22 +11152,205 @@ _ACEOF fi if test "$ac_cv_kerberos5" = yes ; then - have_kerberos=yes - have_kerberos5=yes - cat >>confdefs.h <<\_ACEOF + + # Andrew Snare wrote: + # + # You were assuming that if kerberosV (krb5) was found, then kerberosIV + # (krb4) was also available. This turns out not to be the case with + # mit-krb-1.2.7; apparently backwards-compatibility with KerberosIV + # is optional. + # + # So, disable kerberosV support if libkrb4 can't be found. + # This is not the best solution, but it makes the compile not fail. + # + + 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 krb_get_tf_realm in -lkrb4" >&5 +echo $ECHO_N "checking for krb_get_tf_realm in -lkrb4... $ECHO_C" >&6 +if test "${ac_cv_lib_krb4_krb_get_tf_realm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb4 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "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 krb_get_tf_realm (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +krb_get_tf_realm (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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_krb4_krb_get_tf_realm=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_krb4_krb_get_tf_realm=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_tf_realm" >&5 +echo "${ECHO_T}$ac_cv_lib_krb4_krb_get_tf_realm" >&6 +if test $ac_cv_lib_krb4_krb_get_tf_realm = yes; then + have_kerberos=yes +else + have_kerberos=no +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + if test "$have_kerberos" = yes ; then + have_kerberos5=yes + cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS 1 _ACEOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS5 1 _ACEOF + else + have_kerberos5=no + { echo "$as_me:$LINENO: WARNING: Cannot find compat lib (libkrb4) needed to use Kerberos 5" >&5 +echo "$as_me: WARNING: Cannot find compat lib (libkrb4) needed to use Kerberos 5" >&2;} + fi + fi if test "$have_kerberos5" = yes ; then # from Matt Knopp # (who got it from amu@mit.edu) - PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err" + + PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" + + # jwz: MacOS X uses -lkrb5, but not -lcrypt + + 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 crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 +if test "${ac_cv_lib_crypt_crypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "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 crypt (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +crypt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 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_crypt_crypt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_crypt_crypt=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 +if test $ac_cv_lib_crypt_crypt = yes; then + PASSWD_LIBS="$PASSWD_LIBS -lcrypt" +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + elif test "$have_kerberos" = yes ; then # from Tim Showalter for FreeBSD 4.2 PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" @@ -12446,7 +12784,6 @@ done # the new way... # run pkg-config based tests. # - pkgs='' pkg_check_version() { if test "$ok" = yes ; then @@ -12476,11 +12813,15 @@ echo "${ECHO_T}no" >&6 fi } + echo "$as_me:$LINENO: result: checking for GTK 2.x with pkg-config based tests..." >&5 +echo "${ECHO_T}checking for GTK 2.x with pkg-config based tests..." >&6 + ok="yes" - pkg_check_version gtk+-2.0 2.0.1 ; ac_gtk_version_string="$vers" - pkg_check_version gmodule-2.0 2.0.0 - pkg_check_version libxml-2.0 2.4.6 - pkg_check_version libglade-2.0 1.99.0 + pkg_check_version gtk+-2.0 2.0.1 ; ac_gtk_version_string="$vers" + pkg_check_version gmodule-2.0 2.0.0 + pkg_check_version libxml-2.0 2.4.6 + pkg_check_version libglade-2.0 1.99.0 +# pkg_check_version gdk_pixbuf 0.1 have_gtk="$ok" if test "$have_gtk" = yes; then @@ -12500,10 +12841,14 @@ _ACEOF # # we don't have GTK 2. Let's look for GTK 1. # + echo "$as_me:$LINENO: result: checking for GTK 1.x with pkg-config based tests..." >&5 +echo "${ECHO_T}checking for GTK 1.x with pkg-config based tests..." >&6 + pkgs='' ok="yes" - pkg_check_version gtk+ 1.2 ; ac_gtk_version_string="$vers" - pkg_check_version glib 1.0 + pkg_check_version gtk+ 1.2 ; ac_gtk_version_string="$vers" + pkg_check_version glib 1.0 + pkg_check_version gdk_pixbuf 0.1 have_gtk="$ok" # Now check for Gnome... @@ -12565,6 +12910,8 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >&6 # the old way... # run {gnome,gtk}-config based tests. # + echo "$as_me:$LINENO: result: checking for GTK 1.x with gtk-config based tests..." >&5 +echo "${ECHO_T}checking for GTK 1.x with gtk-config based tests..." >&6 for ac_prog in glib12-config glib-config do @@ -12720,15 +13067,16 @@ fi echo "$as_me:$LINENO: result: $ac_cv_gtk_version_string" >&5 echo "${ECHO_T}$ac_cv_gtk_version_string" >&6 ac_gtk_version_string=$ac_cv_gtk_version_string + parse_gtk_version_string fi - parse_gtk_version_string - - if test "$ac_gtk_version" = "unknown" || test "$ac_gtk_version" -lt 1002 - then - have_gtk=no - have_gnome=no - jurassic_gtk=yes + if test "$have_gtk" = yes; then + if test "$ac_gtk_version" = "unknown" || test "$ac_gtk_version" -lt 1002 + then + have_gtk=no + have_gnome=no + jurassic_gtk=yes + fi fi if test "$have_gtk" = yes; then @@ -12768,7 +13116,7 @@ echo $ECHO_N "checking for Gnome capplet includes... $ECHO_C" >&6 if test "${ac_cv_gnome_config_cflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if ( $gnome_config --cflags $gnome_config_libs >/dev/null 2>&1 | \ + if ( $gnome_config --cflags $gnome_config_libs 2>&1 | \ grep Unknown >/dev/null ) ; then ac_cv_gnome_config_cflags='' else @@ -12793,7 +13141,7 @@ echo $ECHO_N "checking for Gnome capplet libs... $ECHO_C" >&6 if test "${ac_cv_gnome_config_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if ( $gnome_config --libs $gnome_config_libs >/dev/null 2>&1 | + if ( $gnome_config --libs $gnome_config_libs 2>&1 | grep Unknown >/dev/null ) ; then ac_cv_gnome_config_libs='' else @@ -14521,7 +14869,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 @@ -14564,7 +14912,7 @@ EOF # M4 sucks!! mglv=`echo "$mglv" | sed -n \ - 's/^configure: *\([0-9][0-9]*\) \([0-9].*\)$/\1.\2/p'` + 's/^configure: *\([0-9][0-9]*\) *\([0-9].*\)$/\1.\2/p'` rm -f conftest.$ac_ext @@ -15429,6 +15777,8 @@ if test "$with_gdk_pixbuf" = yes; then # # we don't have Gtk; or we have Gtk 2.x. Check for pixbuf 2.x. # + echo "$as_me:$LINENO: result: checking for gdk_pixbuf 2.x with gtk-config based tests..." >&5 +echo "${ECHO_T}checking for gdk_pixbuf 2.x with gtk-config based tests..." >&6 pkg_check_version gdk-pixbuf-2.0 2.0.0 pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 have_gdk_pixbuf="$ok" @@ -15443,8 +15793,10 @@ if test "$with_gdk_pixbuf" = yes; then if test "$have_gdk_pixbuf2" = no; then pkgs='' ok="yes" - pkg_check_version gdk-pixbuf 0.0 - pkg_check_version gdk-pixbuf-xlib 0.0 + echo "$as_me:$LINENO: result: checking for gdk_pixbuf 1.x with gtk-config based tests..." >&5 +echo "${ECHO_T}checking for gdk_pixbuf 1.x with gtk-config based tests..." >&6 + pkg_check_version gdk_pixbuf 0.0 + pkg_check_version gdk_pixbuf_xlib 0.0 have_gdk_pixbuf="$ok" fi fi @@ -15483,6 +15835,9 @@ echo "${ECHO_T}$ac_cv_gdk_pixbuf_config_libs" >&6 # pkg-config exists, but doesn't know about pixbuf. # + echo "$as_me:$LINENO: result: checking for gdk_pixbuf with gdk-pixbuf-config based tests..." >&5 +echo "${ECHO_T}checking for gdk_pixbuf with gdk-pixbuf-config based tests..." >&6 + # if the user specified --with-gtk=/foo/ or --with-gnome=/foo/ then # look in /foo/bin/ for for gdk-pixbuf-config. # @@ -19043,7 +19398,10 @@ if test "$gtk2_halfassed" != no ; then fi -if test "$with_gnome_req" = yes -a "$have_gnome" = no ; then +if test "$with_gnome_req" = yes -a "$have_gnome" = no \ + -a "$have_gtk2" = no; then + # don't issue this warning if we have GTK2 -- in that case, the + # Gnome-specific code isn't needed. warn 'Use of the Gnome Control Panel was requested, but the necessary' warn2 'headers and/or libraries were not found.' fi @@ -19182,7 +19540,13 @@ if test "$have_jpeg" = no ; then echo '' fi - warn2 "This means the \`webcollage' program will be much slower." + if test "$have_gdk_pixbuf" = no ; then + warn2 "This means that it won't be possible for the image-manipulating" + warn2 "display modes to load files from disk; and it also means that" + warn2 "the \`webcollage' program will be much slower." + else + warn2 "This means the \`webcollage' program will be much slower." + fi fi @@ -19236,6 +19600,11 @@ fi if test "$have_gl" = yes -a "$have_gle" = no ; then + + # nobody cares about this; don't print the warning unless it was + # requested and not found, or halfway-found. + if test "$with_gle_req" = yes -o "$gle_halfassed" = yes ; then + if test "$with_gle_req" = yes ; then noteL 'Use of the GLE (GL Extrusion) library was requested, but' warn2 'it was not found (though the OpenGL library was found, and' @@ -19263,6 +19632,7 @@ if test "$have_gl" = yes -a "$have_gle" = no ; then warn2 'GLE library at . For general' warn2 'OpenGL info, see .' + fi fi @@ -19383,7 +19753,7 @@ if test "$do_dir_warning" = yes; then echo ' "xscreensaver-demo", and "xscreensaver-command" executables' echo " will be installed in ${bindir}/." echo "" - echo " The various graphics demos (150+ different executables) will" + echo " The various graphics demos (160+ different executables) will" echo " be installed in ${HACKDIR}/." echo "" echo " If you would prefer the demos to be installed elsewhere,"