projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be on the safe side with initialisation of c->name.
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
4bddb0b
..
ae154de
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-46,11
+46,11
@@
case $host_os in
;;
*freebsd*)
AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
;;
*freebsd*)
AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
- [ rm -f src/device.c; ln -sf
free
bsd/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
*darwin*)
AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
;;
*darwin*)
AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
- [ rm -f src/device.c; ln -sf
darwin
/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf
bsd
/device.c src/device.c ]
;;
*solaris*)
AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
;;
*solaris*)
AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
@@
-58,11
+58,16
@@
case $host_os in
;;
*openbsd*)
AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
;;
*openbsd*)
AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
- [ rm -f src/device.c; ln -sf
open
bsd/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
*netbsd*)
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
;;
*netbsd*)
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
- [ rm -f src/device.c; ln -sf netbsd/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+ ;;
+ *bsd*)
+ AC_MSG_WARN("Unknown BSD variant, tinc might not compile or work!")
+ AC_DEFINE(HAVE_BSD, 1, [Unknown BSD variant])
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
*cygwin*)
AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
;;
*cygwin*)
AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
@@
-93,8
+98,8
@@
dnl Checks for header files.
dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
AC_HEADER_STDC
dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/
param.h sys/time.h sys/socket.h sys/wait.h sys/mman
.h netdb.h arpa/inet.h])
-AC_CHECK_HEADERS([net/if.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/
mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait
.h netdb.h arpa/inet.h])
+AC_CHECK_HEADERS([net/if.h net/
if_types.h net/if_tun.h net/if_tap.h net/
ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
[], [], [#include "have.h"]
)
AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
[], [], [#include "have.h"]
)
AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
@@
-122,7
+127,7
@@
dnl Checks for library functions.
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog
writev
],
[], [], [#include "have.h"]
)
jm_FUNC_MALLOC
[], [], [#include "have.h"]
)
jm_FUNC_MALLOC
@@
-169,6
+174,6
@@
AC_ARG_ENABLE(tracing,
AC_SUBST(INCLUDES)
AC_SUBST(INCLUDES)
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
doc/tincd.8 doc/tinc.conf.5 doc/tincinclude.texi
lib/Makefile po/Makefile.in m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile po/Makefile.in m4/Makefile])
AC_OUTPUT
AC_OUTPUT