74 lines
2 KiB
Text
74 lines
2 KiB
Text
$NetBSD: patch-ab,v 1.10 2010/12/06 11:56:44 markd Exp $
|
|
|
|
--- configure.orig 2007-05-30 21:56:35.000000000 +0000
|
|
+++ configure
|
|
@@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
|
|
|
|
fi
|
|
|
|
+GRAPHICS_MAGICK_CONFIG=
|
|
|
|
if test -n "$GRAPHICS_MAGICK_CONFIG"; then
|
|
vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
|
|
@@ -37010,10 +37011,10 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
|
|
|
|
|
|
if test -n "$PKGCONFIG"; then
|
|
- vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
|
|
+ vers=`$PKGCONFIG libwpd-0.9 --modversion 2>/dev/null`
|
|
if test -n "$vers"
|
|
then
|
|
- LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
|
|
+ LIBWPD_LIBS="`$PKGCONFIG libwpd-0.9 --libs`"
|
|
LIBWPD_RPATH=
|
|
for args in $LIBWPD_LIBS; do
|
|
case $args in
|
|
@@ -37023,7 +37024,7 @@ if test -n "$PKGCONFIG"; then
|
|
esac
|
|
done
|
|
LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
|
|
- LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
|
|
+ LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.9 --cflags`"
|
|
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -38534,7 +38535,7 @@ fi
|
|
|
|
|
|
|
|
-if test "x$compile_kexi_macros_plugin" == "xyes"; then
|
|
+if test "x$compile_kexi_macros_plugin" = "xyes"; then
|
|
compile_kexi_macros_plugin_TRUE=
|
|
compile_kexi_macros_plugin_FALSE='#'
|
|
else
|
|
@@ -38543,7 +38544,7 @@ else
|
|
fi
|
|
|
|
|
|
-if test "$compile_kexi_macros_plugin" == "yes"; then
|
|
+if test "$compile_kexi_macros_plugin" = "yes"; then
|
|
|
|
cat >>confdefs.h <<\_ACEOF
|
|
#define KEXI_MACROS_SUPPORT 1
|
|
@@ -38928,6 +38929,10 @@ else
|
|
version=""2.5""
|
|
fi
|
|
|
|
+if test -n "${PYVERSSUFFIX}"; then
|
|
+ version="${PYVERSSUFFIX}"
|
|
+fi
|
|
+
|
|
{ echo "$as_me:$LINENO: checking for Python$version" >&5
|
|
echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
|
|
|
|
@@ -51132,6 +51137,10 @@ else
|
|
version=""2.5""
|
|
fi
|
|
|
|
+if test -n "${PYVERSSUFFIX}"; then
|
|
+ version="${PYVERSSUFFIX}"
|
|
+fi
|
|
+
|
|
{ echo "$as_me:$LINENO: checking for Python$version" >&5
|
|
echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
|
|
|