Mercurial > emacs

comparison configure @ 81486:4fa637b72d35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Regenerate, with magic shell function message patch.
author Glenn Morris <rgm@gnu.org>
date Wed, 20 Jun 2007 07:54:01 +0000
parents e300151b6b3a
children f5538958a28a
comparison
equal deleted inserted replaced
81485:518327b0a441 81486:4fa637b72d35
1335 --with-x-toolkit=KIT use an X toolkit 1335 --with-x-toolkit=KIT use an X toolkit
1336 (KIT = yes/lucid/athena/motif/gtk/no) 1336 (KIT = yes/lucid/athena/motif/gtk/no)
1337 --with-xpm use -lXpm for displaying XPM images 1337 --with-xpm use -lXpm for displaying XPM images
1338 --with-jpeg use -ljpeg for displaying JPEG images 1338 --with-jpeg use -ljpeg for displaying JPEG images
1339 --with-tiff use -ltiff for displaying TIFF images 1339 --with-tiff use -ltiff for displaying TIFF images
1340 --with-gif use -lungif (or -lgif) for displaying GIF images 1340 --with-gif use -lgif (or -lungif) for displaying GIF images
1341 --with-png use -lpng for displaying PNG images 1341 --with-png use -lpng for displaying PNG images
1342 --with-gpm use -lgpm for mouse support on a GNU/Linux console 1342 --with-gpm use -lgpm for mouse support on a GNU/Linux console
1343 --with-gtk use GTK (same as --with-x-toolkit=gtk) 1343 --with-gtk use GTK (same as --with-x-toolkit=gtk)
1344 --with-pkg-config-prog Path to pkg-config to use for finding GTK 1344 --with-pkg-config-prog Path to pkg-config to use for finding GTK
1345 --without-toolkit-scroll-bars 1345 --without-toolkit-scroll-bars
13878 13878
13879 fi 13879 fi
13880 if test $ac_cv_header_gif_lib_h = yes; then 13880 if test $ac_cv_header_gif_lib_h = yes; then
13881 # EGifPutExtensionLast only exists from version libungif-4.1.0b1. 13881 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
13882 # Earlier versions can crash Emacs. 13882 # Earlier versions can crash Emacs.
13883 { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 13883 { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5
13884 echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; } 13884 echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; }
13885 if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then 13885 if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then
13886 echo $ECHO_N "(cached) $ECHO_C" >&6 13886 echo $ECHO_N "(cached) $ECHO_C" >&6
13887 else 13887 else
13888 ac_check_lib_save_LIBS=$LIBS 13888 ac_check_lib_save_LIBS=$LIBS
13889 LIBS="-lungif $LIBS" 13889 LIBS="-lgif $LIBS"
13890 cat >conftest.$ac_ext <<_ACEOF 13890 cat >conftest.$ac_ext <<_ACEOF
13891 /* confdefs.h. */ 13891 /* confdefs.h. */
13892 _ACEOF 13892 _ACEOF
13893 cat confdefs.h >>conftest.$ac_ext 13893 cat confdefs.h >>conftest.$ac_ext
13894 cat >>conftest.$ac_ext <<_ACEOF 13894 cat >>conftest.$ac_ext <<_ACEOF
13925 (exit $ac_status); } && { 13925 (exit $ac_status); } && {
13926 test -z "$ac_c_werror_flag" || 13926 test -z "$ac_c_werror_flag" ||
13927 test ! -s conftest.err 13927 test ! -s conftest.err
13928 } && test -s conftest$ac_exeext && 13928 } && test -s conftest$ac_exeext &&
13929 $as_test_x conftest$ac_exeext; then 13929 $as_test_x conftest$ac_exeext; then
13930 ac_cv_lib_ungif_EGifPutExtensionLast=yes 13930 ac_cv_lib_gif_EGifPutExtensionLast=yes
13931 else 13931 else
13932 echo "$as_me: failed program was:" >&5 13932 echo "$as_me: failed program was:" >&5
13933 sed 's/^/| /' conftest.$ac_ext >&5 13933 sed 's/^/| /' conftest.$ac_ext >&5
13934 13934
13935 ac_cv_lib_ungif_EGifPutExtensionLast=no 13935 ac_cv_lib_gif_EGifPutExtensionLast=no
13936 fi 13936 fi
13937 13937
13938 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 13938 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13939 conftest$ac_exeext conftest.$ac_ext 13939 conftest$ac_exeext conftest.$ac_ext
13940 LIBS=$ac_check_lib_save_LIBS 13940 LIBS=$ac_check_lib_save_LIBS
13941 fi 13941 fi
13942 { echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 13942 { echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
13943 echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } 13943 echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
13944 if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then 13944 if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then
13945 HAVE_GIF=yes 13945 HAVE_GIF=yes
13946 else 13946 else
13947 try_libgif=yes 13947 try_libungif=yes
13948 fi 13948 fi
13949 13949
13950 fi 13950 fi
13951 13951
13952 13952
13953 13953
13954 if test "$HAVE_GIF" = yes; then 13954 if test "$HAVE_GIF" = yes; then
13955 ac_gif_lib_name="-lungif" 13955 ac_gif_lib_name="-lgif"
13956 fi 13956 fi
13957 13957
13958 # If gif_lib.h but no libungif, try libgif. 13958 # If gif_lib.h but no libgif, try libungif.
13959 if test x"$try_libgif" = xyes; then 13959 if test x"$try_libungif" = xyes; then
13960 { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5 13960 { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5
13961 echo $ECHO_N "checking for EGifPutExtensionLast in -lgif... $ECHO_C" >&6; } 13961 echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; }
13962 if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then 13962 if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
13963 echo $ECHO_N "(cached) $ECHO_C" >&6 13963 echo $ECHO_N "(cached) $ECHO_C" >&6
13964 else 13964 else
13965 ac_check_lib_save_LIBS=$LIBS 13965 ac_check_lib_save_LIBS=$LIBS
13966 LIBS="-lgif $LIBS" 13966 LIBS="-lungif $LIBS"
13967 cat >conftest.$ac_ext <<_ACEOF 13967 cat >conftest.$ac_ext <<_ACEOF
13968 /* confdefs.h. */ 13968 /* confdefs.h. */
13969 _ACEOF 13969 _ACEOF
13970 cat confdefs.h >>conftest.$ac_ext 13970 cat confdefs.h >>conftest.$ac_ext
13971 cat >>conftest.$ac_ext <<_ACEOF 13971 cat >>conftest.$ac_ext <<_ACEOF
14002 (exit $ac_status); } && { 14002 (exit $ac_status); } && {
14003 test -z "$ac_c_werror_flag" || 14003 test -z "$ac_c_werror_flag" ||
14004 test ! -s conftest.err 14004 test ! -s conftest.err
14005 } && test -s conftest$ac_exeext && 14005 } && test -s conftest$ac_exeext &&
14006 $as_test_x conftest$ac_exeext; then 14006 $as_test_x conftest$ac_exeext; then
14007 ac_cv_lib_gif_EGifPutExtensionLast=yes 14007 ac_cv_lib_ungif_EGifPutExtensionLast=yes
14008 else 14008 else
14009 echo "$as_me: failed program was:" >&5 14009 echo "$as_me: failed program was:" >&5
14010 sed 's/^/| /' conftest.$ac_ext >&5 14010 sed 's/^/| /' conftest.$ac_ext >&5
14011 14011
14012 ac_cv_lib_gif_EGifPutExtensionLast=no 14012 ac_cv_lib_ungif_EGifPutExtensionLast=no
14013 fi 14013 fi
14014 14014
14015 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 14015 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14016 conftest$ac_exeext conftest.$ac_ext 14016 conftest$ac_exeext conftest.$ac_ext
14017 LIBS=$ac_check_lib_save_LIBS 14017 LIBS=$ac_check_lib_save_LIBS
14018 fi 14018 fi
14019 { echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 14019 { echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
14020 echo "${ECHO_T}$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } 14020 echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
14021 if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then 14021 if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
14022 HAVE_GIF=yes 14022 HAVE_GIF=yes
14023 fi 14023 fi
14024 14024
14025 14025
14026 if test "$HAVE_GIF" = yes; then 14026 if test "$HAVE_GIF" = yes; then
14027 14027
14028 cat >>confdefs.h <<\_ACEOF 14028 cat >>confdefs.h <<\_ACEOF
14029 #define LIBGIF -lgif 14029 #define LIBGIF -lungif
14030 _ACEOF 14030 _ACEOF
14031 14031
14032 ac_gif_lib_name="-lgif" 14032 ac_gif_lib_name="-lungif"
14033 fi 14033 fi
14034 fi 14034 fi
14035 14035
14036 if test "${HAVE_GIF}" = "yes"; then 14036 if test "${HAVE_GIF}" = "yes"; then
14037 14037