[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: patching acinclude.m4,
From:       Rex Dieter <rdieter () math ! unl ! edu>
Date:       2007-12-20 15:44:44
Message-ID: fke2lh$kr$1 () ger ! gmane ! org
[Download RAW message or body]

Rex Dieter wrote Dec 06:

> See also,
> http://bugs.kde.org/136377
> 
> Finally got bothered enough to want to do something about it to propose
> patches for
> branches/KDE/3.5/kde-common/admin/acinclude.m4

Please review this final patch (attached, and included in bug reference
above).  I was about to commit it myself, just now, but I lack sufficient
mojo/Karma.

-- Rex

["acinclude.m4.in.fedora.patch" (text/x-diff)]

Index: acinclude.m4.in
===================================================================
--- acinclude.m4.in	(revision 750908)
+++ acinclude.m4.in	(working copy)
@@ -1226,7 +1226,15 @@
   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
 fi
 if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 \
/usr/lib${kdelibsuff}/qt-3.3" +  if test -z "$PKG_CONFIG"; then
+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if test "$PKG_CONFIG" != "no" ; then
+    if (`$PKG_CONFIG --exists qt-mt`) ; then
+       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+    fi
+  fi
 fi
 if test $kde_qtver = 2; then
    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
 for dir in $kde_qt_dirs; do
    qt_incdirs="$qt_incdirs $dir/include $dir"
 done
+if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+  if (`$PKG_CONFIG --exists qt-mt`) ; then
+      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+  fi
+fi
 qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include \
/usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 \
/usr/include/qt3 $x_includes"  if test ! "$ac_qt_includes" = "NO"; then
    qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
 done
+if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+  if (`$PKG_CONFIG --exists qt-mt`) ; then
+      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+  fi
+fi
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib \
$x_libraries"  if test ! "$ac_qt_libraries" = "NO"; then
   qt_libdir=$ac_qt_libraries



[prev in list] [next in list] [prev in thread] [next in thread]