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 4a87c00678972ae90439b2422e464816151e8154..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
@@
-141,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
@@
-212,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))
;;
@@
-227,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