50 lines
2.2 KiB
Text
50 lines
2.2 KiB
Text
--- configure.orig 2012-01-19 17:19:29.000000000 -0200
|
|
+++ configure 2013-10-09 15:07:40.051081546 -0300
|
|
@@ -30836,12 +30836,17 @@
|
|
esac
|
|
fi
|
|
|
|
+# KDE4_PREFIX override
|
|
+ if test x"${with_kde4_prefix}" != x; then
|
|
+ KDE4_PREFIX="${with_kde4_prefix}"
|
|
+ fi
|
|
+
|
|
if test x"${with_kde4_plugindir}" != x ; then
|
|
KDE4_PLUGINDIR="${with_kde4_plugindir}"
|
|
else
|
|
- if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release || \
|
|
- test -d ${KDE4_PREFIX}/lib64 -a -f /usr/lib/rpm/suse_macros; then
|
|
- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
|
|
+ if test -d ${KDE4_PREFIX}/lib -a -f /etc/redhat-release || \
|
|
+ test -d ${KDE4_PREFIX}/lib -a -f /usr/lib/rpm/suse_macros; then
|
|
+ KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
|
|
else
|
|
KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
|
|
fi
|
|
@@ -49394,7 +49399,7 @@
|
|
|
|
if test x$build_agg = xyes; then # {
|
|
echo " AGG Pixel format is: $pixelformat"
|
|
- if test x"$AGG_LIBS" != x -a x"${agg25}" == xyes; then # {
|
|
+ if test x"$AGG_LIBS" != x -a x"${agg25}" = xyes; then # {
|
|
if test x"$AGG_CFLAGS" != x; then # {
|
|
echo " AGG flags are: $AGG_CFLAGS"
|
|
else # }{
|
|
@@ -50044,7 +50049,7 @@
|
|
else
|
|
|
|
pkg_out_fd=3
|
|
- echo " ERROR: `echo "No SSL development package is installed, but it's enabled."" | fold -s -w 62 | sed 's/^/ /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
|
|
+ echo " ERROR: `echo "No SSL development package is installed, but it's enabled." | fold -s -w 62 | sed 's/^/ /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
|
|
deb_dest="$deb_err"
|
|
rpm_dest="$rpm_err"
|
|
yast_dest="$yast_err"
|
|
@@ -50063,7 +50068,7 @@
|
|
else
|
|
|
|
pkg_out_fd=3
|
|
- echo " ERROR: `echo "No SSH development package is installed, but it's enabled."" | fold -s -w 62 | sed 's/^/ /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
|
|
+ echo " ERROR: `echo "No SSH development package is installed, but it's enabled." | fold -s -w 62 | sed 's/^/ /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
|
|
deb_dest="$deb_err"
|
|
rpm_dest="$rpm_err"
|
|
yast_dest="$yast_err"
|