Mercurial > emacs
comparison configure.in @ 25407:479691c42edf
(USE_TOOLKIT_SCROLL_BARS): Move tests for
-lXaw3d, -lXpm, -ljpeg, -lpng, -ltiff, and -lgif, down
after the other X-related libraries.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 28 Aug 1999 06:23:04 +0000 |
parents | da6d69f3f044 |
children | f61069dbc746 |
comparison
equal
deleted
inserted
replaced
25406:9ade71ed0686 | 25407:479691c42edf |
---|---|
1245 ### If we're using X11, we should use the X menu package. | 1245 ### If we're using X11, we should use the X menu package. |
1246 HAVE_MENUS=no | 1246 HAVE_MENUS=no |
1247 case ${HAVE_X11} in | 1247 case ${HAVE_X11} in |
1248 yes ) HAVE_MENUS=yes ;; | 1248 yes ) HAVE_MENUS=yes ;; |
1249 esac | 1249 esac |
1250 | |
1251 ### Is -lXaw3d available? | |
1252 HAVE_XAW3D=no | |
1253 if test "${HAVE_X11}" = "yes"; then | |
1254 if test "${USE_X_TOOLKIT}" != "none"; then | |
1255 old_c_flags="${CFLAGS}" | |
1256 CFLAGS="${LD_SWITCH_X_SITE}" | |
1257 AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h, | |
1258 AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes, , -lX11)) | |
1259 CFLAGS="${old_c_flags}" | |
1260 | |
1261 if test "${HAVE_XAW3D}" = "yes"; then | |
1262 AC_DEFINE(HAVE_XAW3D) | |
1263 fi | |
1264 fi | |
1265 fi | |
1266 | |
1267 ### Use -lXpm if available, unless `--with-xpm=no'. | |
1268 HAVE_XPM=no | |
1269 if test "${HAVE_X11}" = "yes"; then | |
1270 if test "${with_xpm}" != "no"; then | |
1271 old_c_flags="${CFLAGS}" | |
1272 CFLAGS="${LD_SWITCH_X_SITE}" | |
1273 AC_CHECK_HEADER(X11/xpm.h, | |
1274 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)) | |
1275 CFLAGS="${old_c_flags}" | |
1276 fi | |
1277 | |
1278 if test "${HAVE_XPM}" = "yes"; then | |
1279 AC_DEFINE(HAVE_XPM) | |
1280 fi | |
1281 fi | |
1282 | |
1283 ### Use -ljpeg if available, unless `--with-jpeg=no'. | |
1284 HAVE_JPEG=no | |
1285 if test "${HAVE_X11}" = "yes"; then | |
1286 if test "${with_jpeg}" != "no"; then | |
1287 old_c_flags="${CFLAGS}" | |
1288 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1289 AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes, , -lX11) | |
1290 CFLAGS="${old_c_flags}" | |
1291 fi | |
1292 | |
1293 if test "${HAVE_JPEG}" = "yes"; then | |
1294 AC_DEFINE(HAVE_JPEG) | |
1295 fi | |
1296 fi | |
1297 | |
1298 ### Use -lpng if available, unless `--with-png=no'. | |
1299 HAVE_PNG=no | |
1300 if test "${HAVE_X11}" = "yes"; then | |
1301 if test "${with_png}" != "no"; then | |
1302 old_c_flags="${CFLAGS}" | |
1303 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1304 AC_CHECK_HEADER(png.h, | |
1305 AC_CHECK_LIB(png, png_set_expand, HAVE_PNG=yes, , -lX11 -lz -lm)) | |
1306 CFLAGS="${old_c_flags}" | |
1307 fi | |
1308 | |
1309 if test "${HAVE_PNG}" = "yes"; then | |
1310 AC_DEFINE(HAVE_PNG) | |
1311 fi | |
1312 fi | |
1313 | |
1314 ### Use -ltiff if available, unless `--with-tiff=no'. | |
1315 HAVE_TIFF=no | |
1316 if test "${HAVE_X11}" = "yes"; then | |
1317 if test "${with_tiff}" != "no"; then | |
1318 old_c_flags="${CFLAGS}" | |
1319 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1320 AC_CHECK_HEADER(tiffio.h, | |
1321 AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11)) | |
1322 CFLAGS="${old_c_flags}" | |
1323 fi | |
1324 | |
1325 if test "${HAVE_TIFF}" = "yes"; then | |
1326 AC_DEFINE(HAVE_TIFF) | |
1327 fi | |
1328 fi | |
1329 | |
1330 ### Use -lgif if available, unless `--with-gif=no'. | |
1331 HAVE_GIF=no | |
1332 if test "${HAVE_X11}" = "yes"; then | |
1333 if test "${with_gif}" != "no"; then | |
1334 old_c_flags="${CFLAGS}" | |
1335 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1336 AC_CHECK_HEADER(gif_lib.h, | |
1337 AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_GIF=yes, , -lX11)) | |
1338 CFLAGS="${old_c_flags}" | |
1339 fi | |
1340 | |
1341 if test "${HAVE_GIF}" = "yes"; then | |
1342 AC_DEFINE(HAVE_GIF) | |
1343 fi | |
1344 fi | |
1345 | 1250 |
1346 if test "${opsys}" = "hpux9"; then | 1251 if test "${opsys}" = "hpux9"; then |
1347 case "${x_libraries}" in | 1252 case "${x_libraries}" in |
1348 *X11R4* ) | 1253 *X11R4* ) |
1349 opsysfile="s/hpux9-x11r4.h" | 1254 opsysfile="s/hpux9-x11r4.h" |
1727 emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)) | 1632 emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)) |
1728 HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1 | 1633 HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1 |
1729 if test $emacs_cv_motif_version_2_1 = yes; then | 1634 if test $emacs_cv_motif_version_2_1 = yes; then |
1730 AC_DEFINE(HAVE_MOTIF_2_1) | 1635 AC_DEFINE(HAVE_MOTIF_2_1) |
1731 AC_CHECK_LIB(Xp, XpCreateContext) | 1636 AC_CHECK_LIB(Xp, XpCreateContext) |
1637 fi | |
1638 fi | |
1639 | |
1640 ### Is -lXaw3d available? | |
1641 HAVE_XAW3D=no | |
1642 if test "${HAVE_X11}" = "yes"; then | |
1643 if test "${USE_X_TOOLKIT}" != "none"; then | |
1644 old_c_flags="${CFLAGS}" | |
1645 CFLAGS="${LD_SWITCH_X_SITE}" | |
1646 AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h, | |
1647 AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes, , -lX11)) | |
1648 CFLAGS="${old_c_flags}" | |
1649 | |
1650 if test "${HAVE_XAW3D}" = "yes"; then | |
1651 AC_DEFINE(HAVE_XAW3D) | |
1652 fi | |
1653 fi | |
1654 fi | |
1655 | |
1656 ### Use -lXpm if available, unless `--with-xpm=no'. | |
1657 HAVE_XPM=no | |
1658 if test "${HAVE_X11}" = "yes"; then | |
1659 if test "${with_xpm}" != "no"; then | |
1660 old_c_flags="${CFLAGS}" | |
1661 CFLAGS="${LD_SWITCH_X_SITE}" | |
1662 AC_CHECK_HEADER(X11/xpm.h, | |
1663 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)) | |
1664 CFLAGS="${old_c_flags}" | |
1665 fi | |
1666 | |
1667 if test "${HAVE_XPM}" = "yes"; then | |
1668 AC_DEFINE(HAVE_XPM) | |
1669 fi | |
1670 fi | |
1671 | |
1672 ### Use -ljpeg if available, unless `--with-jpeg=no'. | |
1673 HAVE_JPEG=no | |
1674 if test "${HAVE_X11}" = "yes"; then | |
1675 if test "${with_jpeg}" != "no"; then | |
1676 old_c_flags="${CFLAGS}" | |
1677 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1678 AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes, , -lX11) | |
1679 CFLAGS="${old_c_flags}" | |
1680 fi | |
1681 | |
1682 if test "${HAVE_JPEG}" = "yes"; then | |
1683 AC_DEFINE(HAVE_JPEG) | |
1684 fi | |
1685 fi | |
1686 | |
1687 ### Use -lpng if available, unless `--with-png=no'. | |
1688 HAVE_PNG=no | |
1689 if test "${HAVE_X11}" = "yes"; then | |
1690 if test "${with_png}" != "no"; then | |
1691 old_c_flags="${CFLAGS}" | |
1692 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1693 AC_CHECK_HEADER(png.h, | |
1694 AC_CHECK_LIB(png, png_set_expand, HAVE_PNG=yes, , -lX11 -lz -lm)) | |
1695 CFLAGS="${old_c_flags}" | |
1696 fi | |
1697 | |
1698 if test "${HAVE_PNG}" = "yes"; then | |
1699 AC_DEFINE(HAVE_PNG) | |
1700 fi | |
1701 fi | |
1702 | |
1703 ### Use -ltiff if available, unless `--with-tiff=no'. | |
1704 HAVE_TIFF=no | |
1705 if test "${HAVE_X11}" = "yes"; then | |
1706 if test "${with_tiff}" != "no"; then | |
1707 old_c_flags="${CFLAGS}" | |
1708 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1709 AC_CHECK_HEADER(tiffio.h, | |
1710 AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11)) | |
1711 CFLAGS="${old_c_flags}" | |
1712 fi | |
1713 | |
1714 if test "${HAVE_TIFF}" = "yes"; then | |
1715 AC_DEFINE(HAVE_TIFF) | |
1716 fi | |
1717 fi | |
1718 | |
1719 ### Use -lgif if available, unless `--with-gif=no'. | |
1720 HAVE_GIF=no | |
1721 if test "${HAVE_X11}" = "yes"; then | |
1722 if test "${with_gif}" != "no"; then | |
1723 old_c_flags="${CFLAGS}" | |
1724 CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | |
1725 AC_CHECK_HEADER(gif_lib.h, | |
1726 AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_GIF=yes, , -lX11)) | |
1727 CFLAGS="${old_c_flags}" | |
1728 fi | |
1729 | |
1730 if test "${HAVE_GIF}" = "yes"; then | |
1731 AC_DEFINE(HAVE_GIF) | |
1732 fi | 1732 fi |
1733 fi | 1733 fi |
1734 | 1734 |
1735 # If netdb.h doesn't declare h_errno, we must declare it by hand. | 1735 # If netdb.h doesn't declare h_errno, we must declare it by hand. |
1736 AC_CACHE_CHECK(whether netdb declares h_errno, | 1736 AC_CACHE_CHECK(whether netdb declares h_errno, |