projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing leaks
[oweals/gnunet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 5b4e472b8de2d547f6851e8aafe37ceba12c12ab..41157ca29e79f21f1e7906f5b27ca755270a306b 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
# This file is part of GNUnet.
# This file is part of GNUnet.
-# (C) 2001
, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
Christian Grothoff (and other contributing authors)
+# (C) 2001
--2010
Christian Grothoff (and other contributing authors)
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
@@
-38,7
+38,6
@@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_CC_C_O
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_CC_C_O
-LT_CONFIG_LTDL_DIR([libltdl])
AC_CANONICAL_HOST
LT_INIT([disable-static dlopen win32-dll])
LTDL_INIT
AC_CANONICAL_HOST
LT_INIT([disable-static dlopen win32-dll])
LTDL_INIT
@@
-69,10
+68,11
@@
DEFAULT_INTERFACE="\"eth0\""
# Check system type
case "$host_os" in
*darwin* | *rhapsody* | *macosx*)
# Check system type
case "$host_os" in
*darwin* | *rhapsody* | *macosx*)
- AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
+ AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system])
+ CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS"
CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
AC_MSG_WARN([The VPN application cannot be compiled on your OS])
CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
AC_MSG_WARN([The VPN application cannot be compiled on your OS])
- build_target="
macosx
"
+ build_target="
darwin
"
DEFAULT_INTERFACE="\"en0\""
LIBPREFIX=
DLLDIR=lib
DEFAULT_INTERFACE="\"en0\""
LIBPREFIX=
DLLDIR=lib
@@
-140,7
+140,7
@@
netbsd*)
AC_CHECK_LIB(intl, gettext)
LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
LIBS="$LIBS -lws2_32 -lplibc"
AC_CHECK_LIB(intl, gettext)
LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
LIBS="$LIBS -lws2_32 -lplibc"
- CFLAGS="-mms-bitfields
-I../../libltdl
$CFLAGS"
+ CFLAGS="-mms-bitfields $CFLAGS"
build_target="mingw"
AC_PROG_CXX
LIBPREFIX=lib
build_target="mingw"
AC_PROG_CXX
LIBPREFIX=lib
@@
-155,7
+155,7
@@
AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should
AC_SUBST(DEFAULT_INTERFACE)
AC_MSG_CHECKING([for build target])
AC_SUBST(DEFAULT_INTERFACE)
AC_MSG_CHECKING([for build target])
-AM_CONDITIONAL(
MACOSX, test "$build_target" = "macosx
")
+AM_CONDITIONAL(
DARWIN, test "$build_target" = "darwin
")
AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin")
AM_CONDITIONAL(MINGW, test "$build_target" = "mingw")
AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")
AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin")
AM_CONDITIONAL(MINGW, test "$build_target" = "mingw")
AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")
@@
-211,14
+211,14
@@
AC_ARG_WITH(extractor,
;;
yes)
AC_CHECK_HEADERS(extractor.h,
;;
yes)
AC_CHECK_HEADERS(extractor.h,
- AC_CHECK_LIB([extractor], [EXTRACTOR_
loadDefaultLibrarie
s],
+ AC_CHECK_LIB([extractor], [EXTRACTOR_
plugin_add_default
s],
extractor=1))
;;
*)
LDFLAGS="-L$with_extractor/lib $LDFLAGS"
CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
AC_CHECK_HEADERS(extractor.h,
extractor=1))
;;
*)
LDFLAGS="-L$with_extractor/lib $LDFLAGS"
CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
AC_CHECK_HEADERS(extractor.h,
- AC_CHECK_LIB([extractor], [EXTRACTOR_
loadDefaultLibrarie
s],
+ AC_CHECK_LIB([extractor], [EXTRACTOR_
plugin_add_default
s],
EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH"
extractor=1))
;;
EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH"
extractor=1))
;;
@@
-226,7
+226,7
@@
AC_ARG_WITH(extractor,
],
[AC_MSG_RESULT([--with-extractor not specified])
AC_CHECK_HEADERS(extractor.h,
],
[AC_MSG_RESULT([--with-extractor not specified])
AC_CHECK_HEADERS(extractor.h,
- AC_CHECK_LIB([extractor], [EXTRACTOR_
loadDefaultLibrarie
s],
+ AC_CHECK_LIB([extractor], [EXTRACTOR_
plugin_add_default
s],
extractor=1))])
if test "$extractor" != 1
then
extractor=1))])
if test "$extractor" != 1
then
@@
-244,7
+244,7
@@
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
# Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
# Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
-AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h iconv.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h])
+AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h iconv.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h
argz.h
])
# Check for GMP header (and abort if not present)
AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Compiling GNUnet requires gmp.h (from the GNU MP library, libgmp)]))
# Check for GMP header (and abort if not present)
AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Compiling GNUnet requires gmp.h (from the GNU MP library, libgmp)]))
@@
-525,7
+525,6
@@
AM_GNU_GETTEXT([external])
AM_ICONV
# Checks for standard typedefs, structures, and compiler characteristics.
AM_ICONV
# Checks for standard typedefs, structures, and compiler characteristics.
-AC_C_CONST
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_MODE_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_MODE_T
@@
-549,6
+548,7
@@
AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
# Checks for library functions.
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_FORK
# Checks for library functions.
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_FORK
+AC_FUNC_VFORK
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
AC_FUNC_SELECT_ARGTYPES
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
AC_FUNC_SELECT_ARGTYPES
@@
-651,8
+651,10
@@
src/hello/Makefile
src/include/Makefile
src/include/gnunet_directories.h
src/hostlist/Makefile
src/include/Makefile
src/include/gnunet_directories.h
src/hostlist/Makefile
+src/nat/Makefile
+src/nat/libnatpmp/Makefile
+src/nat/miniupnp/Makefile
src/peerinfo/Makefile
src/peerinfo/Makefile
-src/resolver/Makefile
src/statistics/Makefile
src/template/Makefile
src/testing/Makefile
src/statistics/Makefile
src/template/Makefile
src/testing/Makefile