Add /sw/{include,lib} to search paths if they exist

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 37f4734..7fc317f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.46 2002/06/08 13:46:06 guus Exp $
+dnl $Id: configure.in,v 1.13.2.49 2002/06/09 15:58:05 zarq Exp $
 
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
@@ -65,12 +65,19 @@ esac
 
 AC_CACHE_SAVE
 
+if test -d /sw/include ; then
+  CPPFLAGS="$CPPFLAGS -I/sw/include"
+fi
+if test -d /sw/lib ; then
+  LIBS="$LIBS -L/sw/lib"
+fi
+
 dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h \
+net/ethernet.h net/if.h netinet/in_systm.h netinet/ip.h netinet/tcp.h \
 sys/file.h sys/ioctl.h sys/param.h sys/time.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -83,12 +90,13 @@ AC_STRUCT_TM
 AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
 [
   AC_TRY_COMPILE(
-  [#include <sys/socket.h>],
+  [#include <sys/types.h>
+  #include <sys/socket.h>],
   [socklen_t len = 42; return len;],
   ac_cv_type_socklen_t=yes,
   ac_cv_type_socklen_t=no)
 ])
-if test $ac_cv_type_socklen_t == yes; then
+if test $ac_cv_type_socklen_t = yes; then
   AC_DEFINE(HAVE_SOCKLEN_T)
 fi
 
@@ -97,7 +105,7 @@ AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name \
-putenv select strdup strerror strsignal strtol unsetenv])
+putenv select strdup strerror strsignal strtol unsetenv getnameinfo])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC