1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
$NetBSD: patch-ab,v 1.9 2007/10/14 07:51:19 adam Exp $
--- configure.orig 2007-01-01 12:34:49.000000000 +0100
+++ configure
@@ -4999,7 +4999,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5073,8 +5073,8 @@ echo "${ECHO_T}$ac_cv_lib_pthread_pthrea
if test $ac_cv_lib_pthread_pthread_create = yes; then
PTHREAD_CPPFLAGS=
- PTHREAD_LDFLAGS=
- PTHREAD_LIBS=-lpthread
+ PTHREAD_LDFLAGS=${PTHREAD_LDFLAGS}
+ PTHREAD_LIBS=${PTHREAD_LIBS}
else
@@ -11263,12 +11263,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- GADU_LIBS=-lgadu
+ GADU_LIBS="-lgadu -lssl -lcrypto ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
{ echo "$as_me:$LINENO: checking if libgadu is in system directories" >&5
echo $ECHO_N "checking if libgadu is in system directories... $ECHO_C" >&6; }
save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -lgadu -lstdc++ -lm"
+ CFLAGS="$CFLAGS ${GADU_LIBS} -lstdc++ -lm"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11694,7 +11694,7 @@ echo "$as_me: error: $mod download faile
echo "MODULE_CONFIGURE_CMD: $MODULE_CONFIGURE_CMD" && \
echo -e "all:\n\t cd ..; make module_$mod; cd $mod\n\ninstall:\n\tcd ..; make module_$mod install_$mod; cd $mod\n\nclean:\n\trm -f *.o *.d *.so *.a *_moc.cpp .final.d .final.cpp.o .final.c.o\n\ndistclean: clean\n\trm -f .cxxflags .ldflags .final.cpp .final.c translations/*.qm\n" > modules/$mod/Makefile && \
- if test $enable_final == yes; then \
+ if test $enable_final = yes; then \
for src in $MODULE_SOURCES; do \
if test "`echo $src | sed 's/.*\.\(.*\)$/\1/'`" == "cpp"; then \
echo "#include \"$src\"" >> modules/$mod/.final2.cpp; \
@@ -11738,7 +11738,11 @@ echo "$as_me: error: $mod download faile
{ echo "$as_me:$LINENO: checking if lib$lib is in system directories" >&5
echo $ECHO_N "checking if lib$lib is in system directories... $ECHO_C" >&6; }
save_CFLAGS="$CFLAGS"
+ if [ x$lib = xssl ]; then
+ CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib -lcrypto"
+ else
CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib -lstdc++ -lm"
+ fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11898,7 +11902,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
\
- MODULE_LDFLAGS="$MODULE_LDFLAGS -l$lib"; \
+ MODULE_LDFLAGS="$MODULE_LDFLAGS -l$lib -Wl,-R${X11BASE}/lib"; \
done && \
for hdr in $MODULE_INCLUDES; do \
|
