[patch] Fix autodetection of qt4_dir

gentoo345139a.patch (text/plain), 1.66 KB, created by Martin von Gagern on 2010-11-12 07:25:16 UTC

Improve autodetection of the qt4 directory.

Currently this fails, causing other paths from a built-in list to take
precedence. If the QTDIR environment variable is set and points at
Qt3, this can lead to the use of an incorrect moc version.

I assume the sed expression was meant to strip the string /include and
anything that follows it. In effect, its broken form removes /include
and any e that follows it, but leaves other suffixes untouched.
Doesn't make a lot of sense that way.

2010-11-12 Martin von Gagern

http://bugs.gentoo.org/345139

Index: gwenhywfar-4.0.1/configure
===================================================================
--- gwenhywfar-4.0.1.orig/configure
+++ gwenhywfar-4.0.1/configure
@@ -19951,7 +19951,7 @@ if test -z "$qt4_includes"; then
                     case $lv1 in
                     *4.*)
                   	qt4_includes="-I$i -I$i/Qt -I$i/QtCore -I$i/QtGui"
-                        qt4_dir=`echo $i | ${SED} 's-/include*--'`
+                        qt4_dir=`echo $i | ${SED} 's-/include.*--'`
                         break;
                         ;;
                     esac
Index: gwenhywfar-4.0.1/m4/qt4.m4
===================================================================
--- gwenhywfar-4.0.1.orig/m4/qt4.m4
+++ gwenhywfar-4.0.1/m4/qt4.m4
@@ -70,7 +70,7 @@ if test -z "$qt4_includes"; then
                     case $lv1 in
                     *4.*)
                   	qt4_includes="-I$i -I$i/Qt -I$i/QtCore -I$i/QtGui"
-                        qt4_dir=`echo $i | ${SED} 's-/include*--'`
+                        qt4_dir=`echo $i | ${SED} 's-/include.*--'`
                         break;
                         ;;
                     esac