comparison configure @ 94600:296d148bd40b

Regenerate.
author Glenn Morris <rgm@gnu.org>
date Sat, 03 May 2008 20:17:10 +0000
parents d462d412f132
children a0615a586d39
comparison
equal deleted inserted replaced
94599:f794a969001a 94600:296d148bd40b
1369 --without-xim don't use X11 XIM 1369 --without-xim don't use X11 XIM
1370 --with-carbon use Carbon GUI on Mac OS X. This is unsupported! 1370 --with-carbon use Carbon GUI on Mac OS X. This is unsupported!
1371 --without-gpm don't use -lgpm for mouse support on a GNU/Linux 1371 --without-gpm don't use -lgpm for mouse support on a GNU/Linux
1372 console 1372 console
1373 --without-dbus don't compile with D-Bus support 1373 --without-dbus don't compile with D-Bus support
1374 --without-makeinfo don't require makeinfo for building manuals
1374 1375
1375 --with-pkg-config-prog=PATH 1376 --with-pkg-config-prog=PATH
1376 Path to pkg-config for finding GTK and librsvg 1377 Path to pkg-config for finding GTK and librsvg
1377 --with-x use the X Window System 1378 --with-x use the X Window System
1378 1379
2099 # Check whether --with-dbus was given. 2100 # Check whether --with-dbus was given.
2100 if test "${with_dbus+set}" = set; then 2101 if test "${with_dbus+set}" = set; then
2101 withval=$with_dbus; 2102 withval=$with_dbus;
2102 else 2103 else
2103 with_dbus=yes 2104 with_dbus=yes
2105 fi
2106
2107
2108 ## For the times when you want to build Emacs but don't have
2109 ## a suitable makeinfo, and can live without the manuals.
2110
2111 # Check whether --with-makeinfo was given.
2112 if test "${with_makeinfo+set}" = set; then
2113 withval=$with_makeinfo;
2114 else
2115 with_makeinfo=yes
2104 fi 2116 fi
2105 2117
2106 2118
2107 2119
2108 # Check whether --with-gtk was given. 2120 # Check whether --with-gtk was given.
5490 if test "$MAKEINFO" != "no" && \ 5502 if test "$MAKEINFO" != "no" && \
5491 test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[6-9]|4\.[1-5][0-9]+)'`" = x; then 5503 test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[6-9]|4\.[1-5][0-9]+)'`" = x; then
5492 MAKEINFO=no 5504 MAKEINFO=no
5493 fi 5505 fi
5494 5506
5495 if test "$MAKEINFO" = "no"; then 5507 if test "$MAKEINFO" = "no" && test "x${with_makeinfo}" != "xno"; then
5496 { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5 5508
5497 echo "$as_me: error: makeinfo >= 4.6 is required " >&2;} 5509 if test -e $srcdir/info/emacs; then
5510 gotinfo="seems"
5511 else
5512 gotinfo="does NOT seem"
5513 fi
5514
5515 { { echo "$as_me:$LINENO: error: You do not seem to have makeinfo >= 4.6.
5516 You will not be able to build the Emacs manuals.
5517 In Emacs releases, they are prebuilt, so this might not be a problem.
5518 Your source tree $gotinfo to have manuals in the \`info' directory.
5519 Either install a suitable version of makeinfo, or re-run configure
5520 with the \`--without-makeinfo' option. " >&5
5521 echo "$as_me: error: You do not seem to have makeinfo >= 4.6.
5522 You will not be able to build the Emacs manuals.
5523 In Emacs releases, they are prebuilt, so this might not be a problem.
5524 Your source tree $gotinfo to have manuals in the \`info' directory.
5525 Either install a suitable version of makeinfo, or re-run configure
5526 with the \`--without-makeinfo' option. " >&2;}
5498 { (exit 1); exit 1; }; } 5527 { (exit 1); exit 1; }; }
5499 fi 5528
5500 5529 fi
5501 5530
5502 5531
5503 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x 5532 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
5504 then 5533 then
5505 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" 5534 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
9290 fi 9319 fi
9291 9320
9292 ## Workaround for bug in autoconf <= 2.62. 9321 ## Workaround for bug in autoconf <= 2.62.
9293 ## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html 9322 ## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html
9294 ## No need to do anything special for these standard directories. 9323 ## No need to do anything special for these standard directories.
9324 ## This is an experiment, take it out if it causes problems.
9295 if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then 9325 if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then
9296 9326
9297 x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'` 9327 x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'`
9298 9328
9299 fi 9329 fi