- Updated CVS_CREATED to remove intl/ directory and some other

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 26f8ba4..e55dc9e 100644 (file)
--- 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.22 2000/11/23 09:30:33 guus Exp $
+dnl $Id: configure.in,v 1.13.2.30 2001/01/17 01:31:56 zarq Exp $
 
 AC_INIT(src/tincd.c)
-AM_INIT_AUTOMAKE(tinc, 1.0pre4-cvs)
+AM_INIT_AUTOMAKE(tinc, 1.0pre4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory
@@ -29,6 +29,22 @@ jm_PERL
 
 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.
@@ -48,17 +64,13 @@ AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([ftime socket select strtol strerror flock unsetenv \
-asprintf putenv strdup fcloseall daemon])
+asprintf putenv strdup fcloseall daemon strsignal get_current_dir_name])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
 AM_GNU_GETTEXT
 
 
-dnl Crypto stuff
-tinc_OPENSSL
-
-
 dnl Support for SunOS
 
 AC_CHECK_FUNC(socket, [], [
@@ -69,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,