blob: 756e75a4956f098cd77b82de1779600ccc3a576f (
plain) (
blame)
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
|
--- configure.orig 2011-08-26 19:03:02.000000000 +0400
+++ configure 2011-09-07 21:22:39.000000000 +0400
@@ -19106,11 +19106,11 @@
SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
LIBS="$LIBS $SVN_KWALLET_LIBS"
qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
- LDFLAGS="$old_LDFLAGS `
+ LDFLAGS="`
input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -19129,7 +19129,7 @@
if test -n "$output_flags"; then
printf "%s" "${output_flags# }"
fi
-`"
+` $old_LDFLAGS"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20714,6 +20714,9 @@
fi
if test "$RUBY" != "none"; then
+ if [ -z "$PTHREAD_LIBS" ]; then
+ PTHREAD_LIBS=-pthread
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking rb_hash_foreach" >&5
$as_echo_n "checking rb_hash_foreach... " >&6; }
if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then
|
