X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=00f170824e79e507b939279d5855e88bf1976e81;hp=6af75ce77833ed014b246922fccd9b0c5b4c0d66;hb=92924e8482f000eb33130ce9feadc08450ff349d;hpb=3cc063d23a6e3a23fd01f03b0bc99825c2b13e16

diff --git a/configure.in b/configure.in
index 6af75ce7..00f17082 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.19 2000/11/20 18:05:34 zarq Exp $
+dnl $Id: configure.in,v 1.13.2.32 2001/06/05 16:13:41 guus Exp $
 
 AC_INIT(src/tincd.c)
-AM_INIT_AUTOMAKE(tinc, 1.0pre4-cvs)
+AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory
@@ -25,11 +25,26 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 jm_PERL
-AM_PROG_LIBTOOL
 
 
 AC_ISC_POSIX
 
+dnl Check and set OS
+
+AC_CANONICAL_HOST
+
+case $host_os in
+  *linux*)
+    AC_DEFINE(HAVE_LINUX)
+  ;;
+  *freebsd*)
+    AC_DEFINE(HAVE_FREEBSD)
+  ;;
+  *solaris*)
+    AC_DEFINE(HAVE_SOLARIS)
+  ;;
+esac
+
 dnl Checks for libraries.
 
 dnl Checks for header files.
@@ -49,20 +64,12 @@ AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([ftime socket select strtol strerror flock unsetenv \
-asprintf putenv strdup])
+asprintf putenv strdup fcloseall daemon strsignal get_current_dir_name])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
 AM_GNU_GETTEXT
 
-AC_CHECK_LIB(dl, dlopen, [
-  LIBS="$LIBS -ldl"
-])
-
-
-dnl Crypto stuff
-tinc_OPENSSL
-
 
 dnl Support for SunOS
 
@@ -74,8 +81,9 @@ AC_CHECK_FUNC(gethostbyname, [], [
 ])
 
 
-dnl Check for TUN/TAP support in the kernel
+dnl These are defined in files in m4/
 tinc_TUNTAP
+tinc_OPENSSL
 
 dnl Check if checkpoint tracing has to be enabled
 AC_ARG_ENABLE(tracing,
@@ -85,6 +93,13 @@ AC_ARG_ENABLE(tracing,
 
 AC_SUBST(INCLUDES)
 
-AC_OUTPUT([Makefile src/Makefile
-doc/Makefile doc/es/Makefile intl/Makefile lib/Makefile
-m4/Makefile po/Makefile.in redhat/Makefile debian/Makefile])
+AC_OUTPUT(Makefile
+src/Makefile
+doc/Makefile
+doc/es/Makefile
+intl/Makefile
+lib/Makefile
+m4/Makefile
+po/Makefile.in
+redhat/Makefile
+debian/Makefile)