--- configure.orig 2008-04-06 12:35:21.000000000 +0200 +++ configure 2008-04-06 12:37:25.000000000 +0200 @@ -856,7 +856,6 @@ --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-gtktest do not try to compile and run a test GTK+ program - --disable-imlibtest Do not try to compile and run a test IMLIB program --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths @@ -867,8 +866,6 @@ (e.g., PFX=/usr/share if the dir WindowMaker/Styles is part of this dir) --with-wmakeretcprefix=PFX Prefix to sysconfig files installed by Window Maker (e.g., PFX=/etc if the file WindowMaker/menu is part of this dir) - --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional) - --with-imlib-exec-prefix=PFX Exec prefix where IMLIB is installed (optional) --with-webbrowser=PROG Web browser to start when a URL is clicked --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib @@ -4950,291 +4947,6 @@ rm -f conf.gtktest -if test -z "$usewraster"; then - # -# Get the cflags and libraries from the imlib-config script -# - -# Check whether --with-imlib-prefix or --without-imlib-prefix was given. -if test "${with_imlib_prefix+set}" = set; then - withval="$with_imlib_prefix" - imlib_prefix="$withval" -else - imlib_prefix="" -fi; - -# Check whether --with-imlib-exec-prefix or --without-imlib-exec-prefix was given. -if test "${with_imlib_exec_prefix+set}" = set; then - withval="$with_imlib_exec_prefix" - imlib_exec_prefix="$withval" -else - imlib_exec_prefix="" -fi; -# Check whether --enable-imlibtest or --disable-imlibtest was given. -if test "${enable_imlibtest+set}" = set; then - enableval="$enable_imlibtest" - -else - enable_imlibtest=yes -fi; - - if test x$imlib_exec_prefix != x ; then - imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_exec_prefix/bin/imlib-config - fi - fi - if test x$imlib_prefix != x ; then - imlib_args="$imlib_args --prefix=$imlib_prefix" - if test x${IMLIB_CONFIG+set} != xset ; then - IMLIB_CONFIG=$imlib_prefix/bin/imlib-config - fi - fi - - - - # Extract the first word of "imlib-config", so it can be a program name with args. -set dummy imlib-config; 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_IMLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $IMLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_IMLIB_CONFIG="$IMLIB_CONFIG" # 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_IMLIB_CONFIG="$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 - - test -z "$ac_cv_path_IMLIB_CONFIG" && ac_cv_path_IMLIB_CONFIG="no" - ;; -esac -fi -IMLIB_CONFIG=$ac_cv_path_IMLIB_CONFIG - -if test -n "$IMLIB_CONFIG"; then - echo "$as_me:$LINENO: result: $IMLIB_CONFIG" >&5 -echo "${ECHO_T}$IMLIB_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - min_imlib_version=1.9.3 - echo "$as_me:$LINENO: checking for IMLIB - version >= $min_imlib_version" >&5 -echo $ECHO_N "checking for IMLIB - version >= $min_imlib_version... $ECHO_C" >&6 - no_imlib="" - if test "$IMLIB_CONFIG" = "no" ; then - no_imlib=yes - else - GDK_IMLIB_CFLAGS=`$IMLIB_CONFIG $imlibconf_args --cflags-gdk` - GDK_IMLIB_LIBS=`$IMLIB_CONFIG $imlibconf_args --libs-gdk` - - imlib_major_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - imlib_minor_version=`$IMLIB_CONFIG $imlib_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - if test "x$enable_imlibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" - LIBS="$LIBS $GDK_IMLIB_LIBS" -# -# Now check if the installed IMLIB is sufficiently new. (Also sanity -# checks the results of imlib-config to some extent -# - rm -f conf.imlibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include <stdio.h> -#include <stdlib.h> -#include <gdk_imlib.h> - -int main () -{ - int major, minor; - char *tmp_version; - - system ("touch conf.gdkimlibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_imlib_version"); - if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) { - printf("%s, bad version string\n", "$min_imlib_version"); - exit(1); - } - - if (($imlib_major_version > major) || - (($imlib_major_version == major) && ($imlib_minor_version >= minor))) - { - return 0; - } - else - { - printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version); - printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor); - printf("*** best to upgrade to the required version.\n"); - printf("*** If imlib-config was wrong, set the environment variable IMLIB_CONFIG\n"); - printf("*** to point to the correct copy of imlib-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - - -_ACEOF -rm -f 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='./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 - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_imlib=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_imlib" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_IMLIB 1 -_ACEOF - have_imlib="yes" - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "$IMLIB_CONFIG" = "no" ; then - echo "*** The imlib-config script installed by IMLIB could not be found" - echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the IMLIB_CONFIG environment variable to the" - echo "*** full path to imlib-config." - else - if test -f conf.gdkimlibtest ; then - : - else - echo "*** Could not run IMLIB test program, checking why..." - CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" - LIBS="$LIBS $GDK_IMLIB_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include <stdio.h> -#include <gdk_imlib.h> - -int -main () -{ - return 0; - ; - 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding IMLIB or finding the wrong" - echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" - echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" - echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - IMLIB_CFLAGS="" - IMLIB_LIBS="" - { echo "$as_me:$LINENO: WARNING: *** IMLIB >= 1.9.3 not installed - please install first ***" >&5 -echo "$as_me: WARNING: *** IMLIB >= 1.9.3 not installed - please install first ***" >&2;} - fi - - - rm -f conf.gdkimlibtest - - # workaround for imlib 1.9.2 - if test "$IMLIB_CONFIG" != "no" ; then - IMLIB_LIBS=`$IMLIB_CONFIG --libs` - GDK_IMLIB_LIBS="$GDK_IMLIB_LIBS $IMLIB_LIBS" - fi -else - CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -fi - # Checks for programs webbrowser=mozilla