Synch up with liece-2_0.

[elisp/liece.git] / configure.in

diff --git a/configure.in b/configure.in
index b908cab..4efef19 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(lisp/liece.el)
+AC_INIT(configure.in)
+AC_PREREQ(2.13)
 AM_INIT_AUTOMAKE(liece, 1.4.5)
 
 AM_PATH_LISPDIR
@@ -9,55 +10,24 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-AC_CHECK_HEADERS(sys/select.h libgen.h socks.h netinet6/in6.h)
+AC_CHECK_HEADERS(sys/select.h libgen.h)
 
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)
 
-AC_CHECK_FUNCS(strtoul memmove basename getaddrinfo)
-
-AC_CHECK_TYPE(fd_set, int)
-
-dnl checking if the system supports ipv6 address space or not
-AC_CACHE_CHECK([for struct in6_addr], ac_cv_struct_in6_addr,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet6/in6.h>], [struct in6_addr v6; v6.s6_addr32[3];],
-ac_cv_struct_in6_addr=yes, ac_cv_struct_in6_addr=no)])
-test "x$ac_cv_struct_in6_addr" = "xyes" && AC_DEFINE(HAVE_IN6_ADDR)
-
-dnl checking if the system supports tcp over ipv6 support or not
-AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_struct_sockaddr_in6,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet6/in6.h>], [struct sockaddr_in6 v6; v6.sin6_addr;],
-ac_cv_struct_sockaddr_in6=yes, ac_cv_struct_sockaddr_in6=no)])
-test "x$ac_cv_struct_sockaddr_in6" = "xyes" && AC_DEFINE(HAVE_SOCKADDR_IN6)
-
-# Check compile with IPv6 support
-AC_MSG_CHECKING(whether we compile with IPv6)
-AC_ARG_ENABLE(ipv6, \
- [ --enable-ipv6           compile with IPv6 [default=no]],, \
-    enable_ipv6=no)
-test "x$enable_ipv6" = "xyes" && AC_DEFINE(INET6)
-AC_MSG_RESULT($enable_ipv6)
-
-# Check whether to retrieve APEL/FLIM distribution.
-AC_MSG_CHECKING(whether we retrieve APEL/FLIM distribution via CVS)
-AC_ARG_ENABLE(tm, \
- [ --enable-tm             retrieve APEL/FLIM distribution via CVS [default=no]],, \
-    enable_tm=no)
-if test "x$enable_tm" = "xyes"; then
-    AC_MSG_RESULT(yes)
-else 
-    AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(USE_TM, test x$enable_tm = xyes)
+AC_CHECK_FUNCS(strtoul memmove getaddrinfo)
+AC_CHECK_FUNC(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+AC_REPLACE_FUNCS(basename)
+AC_CHECK_EMACS
+AC_PATH_LISPDIR
+AC_PATH_ETCDIR
+AC_PATH_PACKAGEDIR
 
 AC_OUTPUT(Makefile \
 lisp/Makefile \
 dcc/Makefile \
-doc/Makefile \
-etc/Makefile)
+dnl doc/Makefile \
+etc/Makefile \
+etc/icons/Makefile \
+etc/po/Makefile \
+etc/styles/Makefile)