|
Line
Link Here
|
| 0 |
-- configure.ac |
0 |
++ configure.ac |
|
Lines 39-46
Link Here
|
| 39 |
AC_PROG_MAKE_SET |
39 |
AC_PROG_MAKE_SET |
| 40 |
LT_CONFIG_LTDL_DIR([libltdl]) |
40 |
LT_CONFIG_LTDL_DIR([libltdl]) |
| 41 |
LT_INIT([disable-static dlopen win32-dll]) |
41 |
LT_INIT([disable-static dlopen win32-dll]) |
| 42 |
AM_PATH_LIBLTDL([lt_dlopenext lt_dlsym], ,AC_MSG_ERROR([GNUnet needs libltdl])) |
|
|
| 43 |
LT_LIB_DLLOAD |
42 |
LT_LIB_DLLOAD |
|
|
43 |
AM_PATH_LIBLTDL([lt_dlopenext lt_dlsym], ,AC_MSG_ERROR([GNUnet needs libltdl])) |
| 44 |
AC_SUBST(MKDIR_P) |
44 |
AC_SUBST(MKDIR_P) |
| 45 |
|
45 |
|
| 46 |
# large file support |
46 |
# large file support |
| 47 |
-- m4/libltdl-external.m4 |
47 |
++ m4/libltdl-external.m4 |
|
Lines 19-33
Link Here
|
| 19 |
libltdl_prefix="$withval", libltdl_prefix="") |
19 |
libltdl_prefix="$withval", libltdl_prefix="") |
| 20 |
ltdl_save_CPPFLAGS="$CPPFLAGS" |
20 |
ltdl_save_CPPFLAGS="$CPPFLAGS" |
| 21 |
ltdl_save_LDFLAGS="$LDFLAGS" |
21 |
ltdl_save_LDFLAGS="$LDFLAGS" |
|
|
22 |
ltdl_save_LIBS="$LIBS" |
| 22 |
if test x$libltdl_prefix != x ; then |
23 |
if test x$libltdl_prefix != x ; then |
| 23 |
CPPFLAGS="-I$libltdl_prefix/include $CPPFLAGS" |
24 |
CPPFLAGS="$CPPFLAGS -I$libltdl_prefix/include" |
| 24 |
LDFLAGS="-L$libltdl_prefix/lib -lltdl $LDFLAGS" |
25 |
LDFLAGS="$LDFLAGS -L$libltdl_prefix/lib" |
|
|
26 |
LIBS="-lltdl $LIBS" |
| 25 |
else |
27 |
else |
| 26 |
if test x"$LIBLTDL" = x ; then |
28 |
if test x"$LIBLTDL" = x ; then |
| 27 |
LIBLTDL="-lltdl" |
29 |
LIBLTDL="-lltdl" |
| 28 |
fi |
30 |
fi |
| 29 |
CPPFLAGS="$LTDLINCL $CPPFLAGS" |
31 |
CPPFLAGS="$LTDLINCL $CPPFLAGS" |
| 30 |
LDFLAGS="$LIBLTDL $LDFLAGS" |
32 |
LIBS="$LIBLTDL $LIBS" |
| 31 |
fi |
33 |
fi |
| 32 |
|
34 |
|
| 33 |
symbols_to_check=ifelse([$1], ,"ltdl_dlopen","$1") |
35 |
symbols_to_check=ifelse([$1], ,"ltdl_dlopen","$1") |
|
Lines 59-64
Link Here
|
| 59 |
fi |
61 |
fi |
| 60 |
CPPFLAGS="$ltdl_save_CPPFLAGS" |
62 |
CPPFLAGS="$ltdl_save_CPPFLAGS" |
| 61 |
LDFLAGS="$ltdl_save_LDFLAGS" |
63 |
LDFLAGS="$ltdl_save_LDFLAGS" |
|
|
64 |
LIBS="$ltdl_save_LIBS" |
| 62 |
|
65 |
|
| 63 |
AC_MSG_CHECKING(for libltdl with symbols $symbols_to_check) |
66 |
AC_MSG_CHECKING(for libltdl with symbols $symbols_to_check) |
| 64 |
if test $ltdl_found = yes; then |
67 |
if test $ltdl_found = yes; then |
