mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
45 lines
1.7 KiB
Plaintext
45 lines
1.7 KiB
Plaintext
--- configure.orig 2011-11-29 20:16:31.000000000 +0400
|
|
+++ configure 2011-12-05 23:43:08.000000000 +0400
|
|
@@ -4326,7 +4326,7 @@
|
|
# ==== Libraries, for which we may have source to build ======================
|
|
|
|
|
|
-APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."
|
|
+APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."
|
|
|
|
|
|
do_subdir_config="yes"
|
|
@@ -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'
|
|
@@ -20762,6 +20762,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
|