X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure;h=f38b7fc7e284b89dd7ca4c3615dbcdb1b43ae80a;hb=4cecfc89e5e889c7232693897c06168fb378bd5c;hp=94dd9a65a282d954ca85c255d316ce0b1fee9e26;hpb=723c9eeee862766a1534b2ce17b78adbfac1c3be;p=xscreensaver diff --git a/configure b/configure index 94dd9a65..f38b7fc7 100755 --- a/configure +++ b/configure @@ -2361,7 +2361,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 -Wall -Wstrict-prototypes -Wnested-externs -Wno-format" + CC="$CC -Wall -Wstrict-prototypes -Wnested-externs" else case "$host" in *-irix5* |*-irix6.0-3* ) @@ -6276,9 +6276,7 @@ _ACEOF -# #### no sign of en_GB -#ALL_LINGUAS="ca de en_GB et fr it ko pl sv da es fi hu ja no pt pt_BR ru wa" -ALL_LINGUAS="ca de et fr it ko pl sv da es fi hu ja no pt pt_BR ru wa" +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" 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 @@ -12494,6 +12492,7 @@ _ACEOF else if test -n "$ac_gtk_version_string" ; then gtk2_halfassed="$ac_gtk_version_string" + gtk2_halfassed_lib="$req" fi fi @@ -12919,7 +12918,7 @@ fi GNOME_DATADIR="" - if test "$have_gnome" = yes -a "$have_gtk" = yes; then + if test "$have_gtk" = yes; then if test -n "$pkg_config"; then if test "$have_gtk2" = yes; then GNOME_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` @@ -12960,9 +12959,11 @@ fi # Check for the Gnome Help Browser. # -if test "$have_gnome" = yes; then - # Extract the first word of "gnome-help-browser", so it can be a program name with args. -set dummy gnome-help-browser; ac_word=$2 +if test "$have_gtk" = yes; then + for ac_prog in yelp gnome-help-browser +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_have_gnome_help+set}" = set; then @@ -12978,14 +12979,13 @@ do 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_have_gnome_help="yes" + ac_cv_prog_have_gnome_help="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done - test -z "$ac_cv_prog_have_gnome_help" && ac_cv_prog_have_gnome_help="no" fi fi have_gnome_help=$ac_cv_prog_have_gnome_help @@ -12997,8 +12997,13 @@ else echo "${ECHO_T}no" >&6 fi -else - have_gnome_help=no + test -n "$have_gnome_help" && break +done +test -n "$have_gnome_help" || have_gnome_help="no" + + if test "$have_gnome_help" != no; then + have_gnome_help=yes + fi fi @@ -14516,13 +14521,34 @@ 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 # include -# define MESA_MAJOR_VERSION XMESA_MAJOR_VERSION -# define MESA_MINOR_VERSION XMESA_MINOR_VERSION +# ifdef XMESA_MAJOR_VERSION + /* Around Mesa 3.2, they took out the Mesa version number, so instead, + we have to check the XMesa version number (the number of the X protocol + support, which seems to be the same as the Mesa version number.) + */ +# define MESA_MAJOR_VERSION XMESA_MAJOR_VERSION +# define MESA_MINOR_VERSION XMESA_MINOR_VERSION +# else + /* Oh great. Some time after 3.4, they took out the xmesa.h header file, + so we have no way of telling what version of Mesa this is at all. + So, we'll guess that the osmesa version (the "offscreen protocol") + is less than or equal to the real mesa version number. Except that + if OSmesa is 3.3, assume at least Mesa 3.4, since OSmesa was 3.3 in + Mesa 3.4. And Mesa 3.3 had xmesa.h. What a complete load of shit! + */ +# include +# define MESA_MAJOR_VERSION OSMESA_MAJOR_VERSION +# define MESA_MINOR_VERSION OSMESA_MINOR_VERSION or newer, probably? +# if OSMESA_MAJOR_VERSION == 3 && OSMESA_MINOR_VERSION == 3 +# undef MESA_MINOR_VERSION +# define MESA_MINOR_VERSION 4 or newer, probably? +# endif +# endif #endif configure: MESA_MAJOR_VERSION MESA_MINOR_VERSION EOF @@ -14538,7 +14564,7 @@ EOF # M4 sucks!! mglv=`echo "$mglv" | sed -n \ - 's/^configure:.*\([0-9][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 @@ -14549,9 +14575,12 @@ EOF ac_mesagl_version=unknown ac_mesagl_version_string=unknown else - ac_mesagl_version_string=$mglv - maj=`echo $mglv | sed -n 's/\..*//p'` - min=`echo $mglv | sed -n 's/.*\.//p'` + ac_mesagl_version_string="$mglv" + # M4 sucks!! + + maj=`echo "$mglv" | sed -n 's/^\([0-9][0-9]*\)\..*$/\1/p'` + min=`echo "$mglv" | sed -n 's/^.*\.\([0-9][0-9]*\).*$/\1/p'` + ac_mesagl_version=`echo "$maj * 1000 + $min" | bc` if test -z "$ac_mesagl_version"; then ac_mesagl_version=unknown @@ -14730,7 +14759,9 @@ echo "${ECHO_T}not found ($d: no such directory)" >&6 GLE_LIBS="" -if test "$with_gle" = yes; then +if test "$have_gl" = no ; then + true +elif test "$with_gle" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" @@ -15300,7 +15331,6 @@ if test "$have_motif" = yes -a "$have_xpm" = yes ; then fi fi - ############################################################################### # # Check for -lgdk_pixbuf. @@ -17466,7 +17496,6 @@ fi if test "$have_gle" = yes; then GLE_EXES='$(GLE_EXES)' - GLE_MEN='$(GLE_MEN)' GLE_KLUDGE="${tab} " else GLE_KLUDGE="-${tab} " @@ -17527,9 +17556,56 @@ else 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" +elif test "$have_gtk" = yes; then + if test -n "$pkg_config"; then + if test "$have_gtk2" = yes; then + PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + else + PO_DATADIR=`$pkg_config --variable=prefix gtk+` + fi + else + PO_DATADIR=`$gtk_config --prefix` + fi + PO_DATADIR="$PO_DATADIR/share" +fi + +if test -z "$PO_DATADIR" ; then + # + # #### Total fucking kludge -- + # Map /build/prefix/usr/X11R6/share/ to /build/prefix/usr/share/ + # but of course we need to expand all the nested variables to do that... + # + dd=$datadir + eval dd=${dd} + eval dd=${dd} + eval dd=${dd} + eval dd=${dd} + eval dd=${dd} + PO_DATADIR=`echo $dd | sed 's@/X11R6/@/@'` +fi + +echo "$as_me:$LINENO: result: $PO_DATADIR/locale" >&5 +echo "${ECHO_T}$PO_DATADIR/locale" >&6 + + # canonicalize slashes. HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` +# gcc 3.0 likes to issue this warning for every file: +# +# cc1: warning: changing search order for system directory "/usr/local/include" +# cc1: warning: as it has already been specified as a non-system directory +# +# Yay. We can only avoid that by deleting "-I${prefix}/include" from the list. +# Which *should* be totally redundant, and thus an ok thing to delete? +# +INCLUDES=`echo "$INCLUDES" | sed 's@ -I${prefix}/include@@g;'` ############################################################################### @@ -18279,13 +18355,13 @@ s,@GL_UTIL_EXES@,$GL_UTIL_EXES,;t t s,@GL_MEN@,$GL_MEN,;t t s,@GL_KLUDGE@,$GL_KLUDGE,;t t s,@GLE_EXES@,$GLE_EXES,;t t -s,@GLE_MEN@,$GLE_MEN,;t t s,@GLE_KLUDGE@,$GLE_KLUDGE,;t t s,@GNOMEHELP_Y@,$GNOMEHELP_Y,;t t s,@GNOMEHELP_N@,$GNOMEHELP_N,;t t s,@HACKDIR@,$HACKDIR,;t t s,@GNOME_DATADIR@,$GNOME_DATADIR,;t t s,@GLADE_DATADIR@,$GLADE_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 @@ -18958,10 +19034,12 @@ elif test "$with_gtk_req" = yes -a "$have_gtk" = no ; then fi if test "$gtk2_halfassed" != no ; then - warnL "GTK version $gtk2_halfassed was found, but some other supporting" - warn2 "libraries were not, so GTK 2.x can't be used. Please" - warn2 "read the above output and the \`config.log' file to see" - warn2 "which libraries are missing." + warnL "GTK version $gtk2_halfassed was found, but at least one supporting" + warn2 "library ($gtk2_halfassed_lib) was not, so GTK 2.x can't be used." + v="$ac_gtk_version_string" + warn2 "GTK $v is also installed, so it will be used instead." + warn2 "Please read the above output and the \`config.log' file" + warn2 "for more details." fi @@ -19001,6 +19079,12 @@ if test "$have_gtk" = yes ; then fi fi +if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then + warn "GTK is being used, but the GDK-Pixbuf library and/or" + warn2 "headers were not found. That can't be good. Please" + warn2 "install the GDK-Pixbuf development kit and re-configure." +fi + if test "$have_motif" = yes -a "$have_lesstif" = yes ; then preferred_lesstif=0.92 @@ -19070,8 +19154,7 @@ if test "$have_xpm" = no -a "$have_gdk_pixbuf" = no || \ echo '' warn2 'Some of the demos will not be as colorful as they' warn2 'could be. You should consider installing Pixbuf or' - warn2 'XPM and re-running configure. (Remember to delete' - warn2 'the config.cache file first.) The Pixbuf library is' + warn2 'XPM and re-running configure. The Pixbuf library is' warn2 'a part of GNOME. The XPM library comes with most' warn2 'X11 installations; you can also find it at the X11' warn2 'archive sites, such as .' @@ -19113,13 +19196,14 @@ if test "$have_gl" = yes -a "$ac_have_mesa_gl" = yes ; then warn2 "Make sure you are using version $preferred_mesagl or newer." elif test \! "$ac_mesagl_version" -gt 2006; then - warnL "MesaGL version $mgv is being used. MesaGL 2.6 and earlier" - warn2 "have a security bug. It is strongly recommended that you" - warn2 "upgrade to at least version $preferred_mesagl." + warnL "MesaGL version number is $mgv --" + warn2 "MesaGL 2.6 and earlier have a security bug. It is strongly" + warn2 "recommended that you upgrade to at least version $preferred_mesagl." elif test \! "$ac_mesagl_version" -gt 3003; then - warnL "MesaGL version $mgv is being used. That version has some" - warn2 "bugs; it is recommended that you upgrade to $pgl or newer." + warnL "MesaGL version number is $mgv --" + warn2 "MesaGL 3.3 and earlier have some bugs; it is recommended" + warn2 "that you upgrade to $pgl or newer." fi fi @@ -19143,8 +19227,7 @@ if test "$have_gl" = no ; then echo '' warn2 'Those demos which use 3D will not be built or installed.' warn2 'You might want to consider installing OpenGL and' - warn2 're-running configure. (Remember to delete the' - warn2 "config.cache file first.) If your vendor doesn't ship" + warn2 "re-running configure. If your vendor doesn't ship" warn2 'their own implementation of OpenGL, you can get a free' warn2 'version at . For general OpenGL' warn2 'info, see .' @@ -19176,10 +19259,9 @@ if test "$have_gl" = yes -a "$have_gle" = no ; then echo '' warn2 'Some of the OpenGL (3D) demos (those that depend on GLE)' warn2 'will not be built or installed. You might want to consider' - warn2 'installing GLE and re-running configure. (Remember to delete' - warn2 'the config.cache file first.) You can find the GLE library' - warn2 'at . For general OpenGL info,' - warn2 'see .' + warn2 'installing GLE and re-running configure. You can find the' + warn2 'GLE library at . For general' + warn2 'OpenGL info, see .' fi @@ -19301,7 +19383,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 (140+ different executables) will" + echo " The various graphics demos (150+ different executables) will" echo " be installed in ${HACKDIR}/." echo "" echo " If you would prefer the demos to be installed elsewhere,"