comparison configure @ 82524:37968753092d

Regenerate, with shell-func message patch.
author Glenn Morris <rgm@gnu.org>
date Wed, 22 Aug 2007 04:20:10 +0000
parents f5538958a28a
children e284140aa5be
comparison
equal deleted inserted replaced
82523:e912a8676e84 82524:37968753092d
685 ALSA_LIBS 685 ALSA_LIBS
686 CFLAGS_SOUND 686 CFLAGS_SOUND
687 SET_MAKE 687 SET_MAKE
688 XMKMF 688 XMKMF
689 HAVE_XSERVER 689 HAVE_XSERVER
690 RSVG_CFLAGS
691 RSVG_LIBS
690 GTK_CFLAGS 692 GTK_CFLAGS
691 GTK_LIBS 693 GTK_LIBS
692 XFT_CFLAGS 694 XFT_CFLAGS
693 XFT_LIBS 695 XFT_LIBS
694 ALLOCA 696 ALLOCA
1339 --with-jpeg use -ljpeg for displaying JPEG images 1341 --with-jpeg use -ljpeg for displaying JPEG images
1340 --with-tiff use -ltiff for displaying TIFF images 1342 --with-tiff use -ltiff for displaying TIFF images
1341 --with-gif use -lgif (or -lungif) for displaying GIF images 1343 --with-gif use -lgif (or -lungif) for displaying GIF images
1342 --with-png use -lpng for displaying PNG images 1344 --with-png use -lpng for displaying PNG images
1343 --with-gpm use -lgpm for mouse support on a GNU/Linux console 1345 --with-gpm use -lgpm for mouse support on a GNU/Linux console
1346 --with-rsvg use -lrsvg-2 for displaying SVG images
1344 --with-gtk use GTK (same as --with-x-toolkit=gtk) 1347 --with-gtk use GTK (same as --with-x-toolkit=gtk)
1345 --with-pkg-config-prog Path to pkg-config to use for finding GTK 1348 --with-pkg-config-prog Path to pkg-config to use for finding GTK and librsvg
1346 --without-toolkit-scroll-bars 1349 --without-toolkit-scroll-bars
1347 don't use Motif or Xaw3d scroll bars 1350 don't use Motif or Xaw3d scroll bars
1348 --without-xim don't use X11 XIM 1351 --without-xim don't use X11 XIM
1349 --without-carbon don't use Carbon GUI on Mac OS X 1352 --without-carbon don't use Carbon GUI on Mac OS X
1350 --with-x use the X Window System 1353 --with-x use the X Window System
1944 1947
1945 1948
1946 # Check whether --with-gpm was given. 1949 # Check whether --with-gpm was given.
1947 if test "${with_gpm+set}" = set; then 1950 if test "${with_gpm+set}" = set; then
1948 withval=$with_gpm; 1951 withval=$with_gpm;
1952 fi
1953
1954
1955 # Check whether --with-rsvg was given.
1956 if test "${with_rsvg+set}" = set; then
1957 withval=$with_rsvg;
1949 fi 1958 fi
1950 1959
1951 1960
1952 # Check whether --with-gtk was given. 1961 # Check whether --with-gtk was given.
1953 if test "${with_gtk+set}" = set; then 1962 if test "${with_gtk+set}" = set; then
9626 9635
9627 if test "$HAVE_XSERVER" = true || 9636 if test "$HAVE_XSERVER" = true ||
9628 test -n "$DISPLAY" || 9637 test -n "$DISPLAY" ||
9629 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then 9638 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
9630 { { echo "$as_me:$LINENO: error: You seem to be running X, but no X development libraries 9639 { { echo "$as_me:$LINENO: error: You seem to be running X, but no X development libraries
9631 where found. You should install the relevant development files for X 9640 were found. You should install the relevant development files for X
9632 and the for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make 9641 and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make
9633 sure you have development files for image handling, i.e. 9642 sure you have development files for image handling, i.e.
9634 tiff, gif, jpeg, png and xpm. 9643 tiff, gif, jpeg, png and xpm.
9635 If you are sure you want Emacs compiled without X window support, pass 9644 If you are sure you want Emacs compiled without X window support, pass
9636 --without-x 9645 --without-x
9637 to configure." >&5 9646 to configure." >&5
9638 echo "$as_me: error: You seem to be running X, but no X development libraries 9647 echo "$as_me: error: You seem to be running X, but no X development libraries
9639 where found. You should install the relevant development files for X 9648 were found. You should install the relevant development files for X
9640 and the for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make 9649 and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make
9641 sure you have development files for image handling, i.e. 9650 sure you have development files for image handling, i.e.
9642 tiff, gif, jpeg, png and xpm. 9651 tiff, gif, jpeg, png and xpm.
9643 If you are sure you want Emacs compiled without X window support, pass 9652 If you are sure you want Emacs compiled without X window support, pass
9644 --without-x 9653 --without-x
9645 to configure." >&2;} 9654 to configure." >&2;}
11066 { echo "$as_me:$LINENO: result: before 5" >&5 11075 { echo "$as_me:$LINENO: result: before 5" >&5
11067 echo "${ECHO_T}before 5" >&6; } 11076 echo "${ECHO_T}before 5" >&6; }
11068 fi 11077 fi
11069 fi 11078 fi
11070 11079
11080 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
11081 HAVE_RSVG=no
11082 if test "${HAVE_X11}" = "yes"; then
11083 if test "${with_rsvg}" != "no"; then
11084 if test "X${with_pkg_config_prog}" != X; then
11085 PKG_CONFIG="${with_pkg_config_prog}"
11086 fi
11087
11088 RSVG_REQUIRED=2.0.0
11089 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
11090
11091
11092 succeeded=no
11093
11094 if test -z "$PKG_CONFIG"; then
11095 # Extract the first word of "pkg-config", so it can be a program name with args.
11096 set dummy pkg-config; ac_word=$2
11097 { echo "$as_me:$LINENO: checking for $ac_word" >&5
11098 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
11099 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
11100 echo $ECHO_N "(cached) $ECHO_C" >&6
11101 else
11102 case $PKG_CONFIG in
11103 [\\/]* | ?:[\\/]*)
11104 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
11105 ;;
11106 *)
11107 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11108 for as_dir in $PATH
11109 do
11110 IFS=$as_save_IFS
11111 test -z "$as_dir" && as_dir=.
11112 for ac_exec_ext in '' $ac_executable_extensions; do
11113 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11114 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
11115 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11116 break 2
11117 fi
11118 done
11119 done
11120 IFS=$as_save_IFS
11121
11122 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
11123 ;;
11124 esac
11125 fi
11126 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
11127 if test -n "$PKG_CONFIG"; then
11128 { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
11129 echo "${ECHO_T}$PKG_CONFIG" >&6; }
11130 else
11131 { echo "$as_me:$LINENO: result: no" >&5
11132 echo "${ECHO_T}no" >&6; }
11133 fi
11134
11135
11136 fi
11137
11138 if test "$PKG_CONFIG" = "no" ; then
11139 :
11140 else
11141 PKG_CONFIG_MIN_VERSION=0.9.0
11142 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
11143 { echo "$as_me:$LINENO: checking for $RSVG_MODULE" >&5
11144 echo $ECHO_N "checking for $RSVG_MODULE... $ECHO_C" >&6; }
11145
11146 if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5; then
11147 { echo "$as_me:$LINENO: result: yes" >&5
11148 echo "${ECHO_T}yes" >&6; }
11149 succeeded=yes
11150
11151 { echo "$as_me:$LINENO: checking RSVG_CFLAGS" >&5
11152 echo $ECHO_N "checking RSVG_CFLAGS... $ECHO_C" >&6; }
11153 RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE"|sed -e 's,///*,/,g'`
11154 { echo "$as_me:$LINENO: result: $RSVG_CFLAGS" >&5
11155 echo "${ECHO_T}$RSVG_CFLAGS" >&6; }
11156
11157 { echo "$as_me:$LINENO: checking RSVG_LIBS" >&5
11158 echo $ECHO_N "checking RSVG_LIBS... $ECHO_C" >&6; }
11159 RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE"|sed -e 's,///*,/,g'`
11160 { echo "$as_me:$LINENO: result: $RSVG_LIBS" >&5
11161 echo "${ECHO_T}$RSVG_LIBS" >&6; }
11162 else
11163 { echo "$as_me:$LINENO: result: no" >&5
11164 echo "${ECHO_T}no" >&6; }
11165 RSVG_CFLAGS=""
11166 RSVG_LIBS=""
11167 ## If we have a custom action on failure, don't print errors, but
11168 ## do set a variable so people can do so.
11169 RSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$RSVG_MODULE"`
11170
11171 fi
11172
11173
11174
11175 else
11176 echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
11177 echo "*** See http://www.freedesktop.org/software/pkgconfig"
11178 fi
11179 fi
11180
11181 if test $succeeded = yes; then
11182 :
11183 else
11184 :
11185 fi
11186
11187
11188
11189
11190 if test ".${RSVG_CFLAGS}" != "."; then
11191 HAVE_RSVG=yes
11192
11193 cat >>confdefs.h <<\_ACEOF
11194 #define HAVE_RSVG 1
11195 _ACEOF
11196
11197 CFLAGS="$CFLAGS $RSVG_CFLAGS"
11198 LIBS="$RSVG_LIBS $LIBS"
11199 fi
11200 fi
11201 fi
11202
11203
11071 HAVE_GTK=no 11204 HAVE_GTK=no
11072 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then 11205 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
11073 USE_X_TOOLKIT=none 11206 USE_X_TOOLKIT=none
11074 fi 11207 fi
11075 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ 11208 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \
18311 /* confdefs.h. */ 18444 /* confdefs.h. */
18312 _ACEOF 18445 _ACEOF
18313 cat confdefs.h >>conftest.$ac_ext 18446 cat confdefs.h >>conftest.$ac_ext
18314 cat >>conftest.$ac_ext <<_ACEOF 18447 cat >>conftest.$ac_ext <<_ACEOF
18315 /* end confdefs.h. */ 18448 /* end confdefs.h. */
18316 #include <stdio.h> 18449 #include <sys/types.h> /* for off_t */
18450 #include <stdio.h>
18317 int 18451 int
18318 main () 18452 main ()
18319 { 18453 {
18320 return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); 18454 int (*fp) (FILE *, off_t, int) = fseeko;
18455 return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
18321 ; 18456 ;
18322 return 0; 18457 return 0;
18323 } 18458 }
18324 _ACEOF 18459 _ACEOF
18325 rm -f conftest.$ac_objext conftest$ac_exeext 18460 rm -f conftest.$ac_objext conftest$ac_exeext
18355 _ACEOF 18490 _ACEOF
18356 cat confdefs.h >>conftest.$ac_ext 18491 cat confdefs.h >>conftest.$ac_ext
18357 cat >>conftest.$ac_ext <<_ACEOF 18492 cat >>conftest.$ac_ext <<_ACEOF
18358 /* end confdefs.h. */ 18493 /* end confdefs.h. */
18359 #define _LARGEFILE_SOURCE 1 18494 #define _LARGEFILE_SOURCE 1
18360 #include <stdio.h> 18495 #include <sys/types.h> /* for off_t */
18496 #include <stdio.h>
18361 int 18497 int
18362 main () 18498 main ()
18363 { 18499 {
18364 return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); 18500 int (*fp) (FILE *, off_t, int) = fseeko;
18501 return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
18365 ; 18502 ;
18366 return 0; 18503 return 0;
18367 } 18504 }
18368 _ACEOF 18505 _ACEOF
18369 rm -f conftest.$ac_objext conftest$ac_exeext 18506 rm -f conftest.$ac_objext conftest$ac_exeext
23512 echo " Does Emacs use -lXpm? ${HAVE_XPM}" 23649 echo " Does Emacs use -lXpm? ${HAVE_XPM}"
23513 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" 23650 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
23514 echo " Does Emacs use -ltiff? ${HAVE_TIFF}" 23651 echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
23515 echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_gif_lib_name" 23652 echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_gif_lib_name"
23516 echo " Does Emacs use -lpng? ${HAVE_PNG}" 23653 echo " Does Emacs use -lpng? ${HAVE_PNG}"
23654 echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
23517 echo " Does Emacs use -lgpm? ${HAVE_GPM}" 23655 echo " Does Emacs use -lgpm? ${HAVE_GPM}"
23518 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" 23656 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
23519 echo 23657 echo
23520 23658
23521 if test $USE_XASSERTS = yes; then 23659 if test $USE_XASSERTS = yes; then
24273 ALSA_LIBS!$ALSA_LIBS$ac_delim 24411 ALSA_LIBS!$ALSA_LIBS$ac_delim
24274 CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim 24412 CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim
24275 SET_MAKE!$SET_MAKE$ac_delim 24413 SET_MAKE!$SET_MAKE$ac_delim
24276 XMKMF!$XMKMF$ac_delim 24414 XMKMF!$XMKMF$ac_delim
24277 HAVE_XSERVER!$HAVE_XSERVER$ac_delim 24415 HAVE_XSERVER!$HAVE_XSERVER$ac_delim
24416 RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim
24417 RSVG_LIBS!$RSVG_LIBS$ac_delim
24278 GTK_CFLAGS!$GTK_CFLAGS$ac_delim 24418 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
24279 GTK_LIBS!$GTK_LIBS$ac_delim 24419 GTK_LIBS!$GTK_LIBS$ac_delim
24280 XFT_CFLAGS!$XFT_CFLAGS$ac_delim 24420 XFT_CFLAGS!$XFT_CFLAGS$ac_delim
24281 XFT_LIBS!$XFT_LIBS$ac_delim 24421 XFT_LIBS!$XFT_LIBS$ac_delim
24282 ALLOCA!$ALLOCA$ac_delim 24422 ALLOCA!$ALLOCA$ac_delim
24297 x_default_search_path!$x_default_search_path$ac_delim 24437 x_default_search_path!$x_default_search_path$ac_delim
24298 etcdir!$etcdir$ac_delim 24438 etcdir!$etcdir$ac_delim
24299 archlibdir!$archlibdir$ac_delim 24439 archlibdir!$archlibdir$ac_delim
24300 bitmapdir!$bitmapdir$ac_delim 24440 bitmapdir!$bitmapdir$ac_delim
24301 gamedir!$gamedir$ac_delim 24441 gamedir!$gamedir$ac_delim
24302 gameuser!$gameuser$ac_delim
24303 c_switch_system!$c_switch_system$ac_delim
24304 _ACEOF 24442 _ACEOF
24305 24443
24306 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 24444 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
24307 break 24445 break
24308 elif $ac_last_try; then 24446 elif $ac_last_try; then
24340 24478
24341 24479
24342 ac_delim='%!_!# ' 24480 ac_delim='%!_!# '
24343 for ac_last_try in false false false false false :; do 24481 for ac_last_try in false false false false false :; do
24344 cat >conf$$subs.sed <<_ACEOF 24482 cat >conf$$subs.sed <<_ACEOF
24483 gameuser!$gameuser$ac_delim
24484 c_switch_system!$c_switch_system$ac_delim
24345 c_switch_machine!$c_switch_machine$ac_delim 24485 c_switch_machine!$c_switch_machine$ac_delim
24346 LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim 24486 LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim
24347 LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim 24487 LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim
24348 C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim 24488 C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim
24349 X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim 24489 X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim
24351 opsysfile!$opsysfile$ac_delim 24491 opsysfile!$opsysfile$ac_delim
24352 carbon_appdir!$carbon_appdir$ac_delim 24492 carbon_appdir!$carbon_appdir$ac_delim
24353 LTLIBOBJS!$LTLIBOBJS$ac_delim 24493 LTLIBOBJS!$LTLIBOBJS$ac_delim
24354 _ACEOF 24494 _ACEOF
24355 24495
24356 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then 24496 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
24357 break 24497 break
24358 elif $ac_last_try; then 24498 elif $ac_last_try; then
24359 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 24499 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
24360 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} 24500 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
24361 { (exit 1); exit 1; }; } 24501 { (exit 1); exit 1; }; }