comparison configure.in @ 53289:ef22c9575b53

Merged in changes from CVS HEAD Patches applied: * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-138 Update from CVS * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-139 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-15
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 28 Dec 2003 16:03:57 +0000
parents 09376ac9647f
children c85ffeab5831
comparison
equal deleted inserted replaced
53238:7a619020ecd2 53289:ef22c9575b53
1505 HAVE_EXCEPTION=$emacs_cv_struct_exception 1505 HAVE_EXCEPTION=$emacs_cv_struct_exception
1506 if test $emacs_cv_struct_exception != yes; then 1506 if test $emacs_cv_struct_exception != yes; then
1507 AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.]) 1507 AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.])
1508 fi 1508 fi
1509 1509
1510 AC_CHECK_HEADERS(sys/socket.h)
1511 AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
1512 #if HAVE_SYS_SOCKET_H
1513 #include <sys/socket.h>
1514 #endif])
1515
1510 dnl checks for structure members 1516 dnl checks for structure members
1511 AC_STRUCT_TM 1517 AC_STRUCT_TM
1512 AC_STRUCT_TIMEZONE 1518 AC_STRUCT_TIMEZONE
1513 AC_CHECK_MEMBER(struct tm.tm_gmtoff, 1519 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
1514 [AC_DEFINE(HAVE_TM_GMTOFF, 1, 1520 [AC_DEFINE(HAVE_TM_GMTOFF, 1,
1515 [Define to 1 if `tm_gmtoff' is member of `struct tm'.])],, 1521 [Define to 1 if `tm_gmtoff' is member of `struct tm'.])],,
1516 [#include <time.h>]) 1522 [#include <time.h>])
1517 AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr, 1523 AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
1518 struct ifreq.ifr_netmask, struct ifreq.ifr_broadaddr, 1524 struct ifreq.ifr_netmask, struct ifreq.ifr_broadaddr,
1519 struct ifreq.ifr_addr], , ,[#include <net/if.h>]) 1525 struct ifreq.ifr_addr], , ,
1526 [AC_INCLUDES_DEFAULT
1527 #if HAVE_SYS_SOCKET_H
1528 #include <sys/socket.h>
1529 #endif
1530 #if HAVE_NET_IF_H
1531 #include <net/if.h>
1532 #endif])
1520 1533
1521 dnl checks for compiler characteristics 1534 dnl checks for compiler characteristics
1522 1535
1523 dnl Testing __STDC__ to determine prototype support isn't good enough. 1536 dnl Testing __STDC__ to determine prototype support isn't good enough.
1524 dnl DEC C, for instance, doesn't define it with default options, and 1537 dnl DEC C, for instance, doesn't define it with default options, and
1843 1856
1844 dnl This function defintion taken from Gnome 2.0 1857 dnl This function defintion taken from Gnome 2.0
1845 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) 1858 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
1846 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page 1859 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
1847 dnl also defines GSTUFF_PKG_ERRORS on error 1860 dnl also defines GSTUFF_PKG_ERRORS on error
1848 AC_DEFUN(PKG_CHECK_MODULES, [ 1861 AC_DEFUN([PKG_CHECK_MODULES], [
1849 succeeded=no 1862 succeeded=no
1850 1863
1851 if test -z "$PKG_CONFIG"; then 1864 if test -z "$PKG_CONFIG"; then
1852 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 1865 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1853 fi 1866 fi
1891 fi 1904 fi
1892 1905
1893 if test $succeeded = yes; then 1906 if test $succeeded = yes; then
1894 ifelse([$3], , :, [$3]) 1907 ifelse([$3], , :, [$3])
1895 else 1908 else
1896 ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) 1909 ifelse([$4], , [AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])], [$4])
1897 fi 1910 fi
1898 ]) 1911 ])
1899 1912
1900 HAVE_GTK=no 1913 HAVE_GTK=no
1901 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then 1914 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
2508 dnl Fixme: Not used. Should this be HAVE_SOCKETS? 2521 dnl Fixme: Not used. Should this be HAVE_SOCKETS?
2509 AC_DEFINE(HAVE_INET_SOCKETS, 1, 2522 AC_DEFINE(HAVE_INET_SOCKETS, 1,
2510 [Define to 1 if you have inet sockets.]) 2523 [Define to 1 if you have inet sockets.])
2511 fi 2524 fi
2512 2525
2513 AC_CHECK_HEADERS(sys/ioctl.h net/if.h) 2526 AC_CHECK_HEADERS(sys/ioctl.h)
2514 2527
2515 if test -f /usr/lpp/X11/bin/smt.exp; then 2528 if test -f /usr/lpp/X11/bin/smt.exp; then
2516 AC_DEFINE(HAVE_AIX_SMT_EXP, 1, 2529 AC_DEFINE(HAVE_AIX_SMT_EXP, 1,
2517 [Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists.]) 2530 [Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists.])
2518 fi 2531 fi