projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use darwin/device.c when compiling on MacOS/X.
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
5efcd87
..
715b401
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,6
+1,6
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.13.2.
45 2002/06/08 12:57:09
guus Exp $
+dnl $Id: configure.in,v 1.13.2.
50 2002/06/10 14:35:18
guus Exp $
AC_INIT(src/tincd.c)
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
AC_INIT(src/tincd.c)
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
@@
-43,8
+43,8
@@
case $host_os in
[ rm -f src/device.c; ln -sf freebsd/device.c src/device.c ]
;;
*darwin*)
[ rm -f src/device.c; ln -sf freebsd/device.c src/device.c ]
;;
*darwin*)
- AC_DEFINE(HAVE_
FREEBSD
)
- [ rm -f src/device.c; ln -sf
freebsd
/device.c src/device.c ]
+ AC_DEFINE(HAVE_
DARWIN
)
+ [ rm -f src/device.c; ln -sf
darwin
/device.c src/device.c ]
;;
*solaris*)
AC_DEFINE(HAVE_SOLARIS)
;;
*solaris*)
AC_DEFINE(HAVE_SOLARIS)
@@
-65,12
+65,19
@@
esac
AC_CACHE_SAVE
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
dnl Checks for libraries.
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.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 \
+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/i
n_systm.h netinet/i
p.h netinet/tcp.h \
sys/file.h sys/ioctl.h sys/param.h sys/time.h])
dnl Checks for typedefs, structures, and compiler characteristics.
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(
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)
])
[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
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 \
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
jm_FUNC_MALLOC
jm_FUNC_REALLOC