--- configure.orig Thu Jan 14 17:51:21 1999 +++ configure Thu Jan 14 17:56:31 1999 @@ -1725,8 +1725,8 @@ echo "configure:1726: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" + LIBS="$LIBS `glib11d-config --libs gmodule`" + CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else @@ -1763,8 +1763,8 @@ #define USE_GMODULE 1 EOF - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" + GMODULE_LIBS="`glib11d-config --libs gmodule`" + GMODULE_FLAGS="`glib11d-config --cflags gmodule`" echo "$ac_t""yes" 1>&6 @@ -1788,140 +1788,6 @@ DYNAMIC_MODULES_WORK_TRUE='#' DYNAMIC_MODULES_WORK_FALSE= fi -# Extract the first word of "djpeg", so it can be a program name with args. -set dummy djpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1795: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$DJPEG_PROG" in - /*) - ac_cv_path_DJPEG_PROG="$DJPEG_PROG" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DJPEG_PROG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -DJPEG_PROG="$ac_cv_path_DJPEG_PROG" -if test -n "$DJPEG_PROG"; then - echo "$ac_t""$DJPEG_PROG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "cjpeg", so it can be a program name with args. -set dummy cjpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1826: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$CJPEG_PROG" in - /*) - ac_cv_path_CJPEG_PROG="$CJPEG_PROG" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_CJPEG_PROG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -CJPEG_PROG="$ac_cv_path_CJPEG_PROG" -if test -n "$CJPEG_PROG"; then - echo "$ac_t""$CJPEG_PROG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -# Extract the first word of "convert", so it can be a program name with args. -set dummy convert; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1858: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$CONVERT_PROG" in - /*) - ac_cv_path_CONVERT_PROG="$CONVERT_PROG" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_CONVERT_PROG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -CONVERT_PROG="$ac_cv_path_CONVERT_PROG" -if test -n "$CONVERT_PROG"; then - echo "$ac_t""$CONVERT_PROG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -echo "CONVERT_PROG is $CONVERT_PROG" -CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'` -echo "CONVERT_PATH is $CONVERT_PATH" - - -# Extract the first word of "giftopnm", so it can be a program name with args. -set dummy giftopnm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1894: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GIFTOPNM_PROG" in - /*) - ac_cv_path_GIFTOPNM_PROG="$GIFTOPNM_PROG" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GIFTOPNM_PROG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -GIFTOPNM_PROG="$ac_cv_path_GIFTOPNM_PROG" -if test -n "$GIFTOPNM_PROG"; then - echo "$ac_t""$GIFTOPNM_PROG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -echo "GIFTOPNM_PROG is $GIFTOPNM_PROG" -NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'` -echo "NETPBM_PATH is $NETPBM_PATH" - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1928: checking how to run the C preprocessor" >&5 @@ -3527,7 +3393,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXext $X_LIBS $LIBS" +LIBS="-lXext -lX11 $X_LIBS $LIBS" cat > conftest.$ac_ext <&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff $GX_LIBS $LIBS" +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS" cat > conftest.$ac_ext <&6 -echo "configure:4095: checking for gif_lib.h" >&5 +ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 +echo "configure:4095: checking for giflib/gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @@ -4317,26 +4183,6 @@ else echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2 fi - -echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6 -echo "configure:4323: checking for libpng version other than 1.0.2" >&5 -cat > conftest.$ac_ext < -PNG_LIBPNG_VER_STRING -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep ""1.0.2"" >/dev/null 2>&1; then - rm -rf conftest* - echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit -else - rm -rf conftest* - png_ok=yes -fi -rm -f conftest* - -echo "$ac_t""$png_ok" 1>&6 if test "$png_ok" = yes; then PNGLIBS="-lpng -lz"