Fix configure for Qt 4.5 and KDE 4.2

gnash-0.8.5-fix-kde4-lib-tests.patch (text/plain), 4.03 KB, created by Robin Atwood on 2009-06-20 13:09:21 UTC

--- configure	2009-03-03 23:22:16.000000000 +0700
+++ configure	2009-06-16 20:50:24.000000000 +0700
@@ -43458,7 +43458,7 @@
 
 fi
 
-      if test x"${build_qt4}" = xyes -a x"${ac_cv_path_qt4_incl}" = x; then
+      if test x"${build_qt4}" = xyes -a x"${ac_cv_path_qt4_incl}" != x; then
             if test x$QTDIR != x; then
       if test -f $QTDIR/include/QtCore/qobject.h; then
         qt_base=`basename $QTDIR`
@@ -43495,6 +43495,8 @@
           break
         fi
       done
+		else
+	gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}" | sed -e 's/-I//g' | cut -d ' ' -f 1`
     fi
 
                 all_qt4_libs="QtCore QtGui QtXml QtDBus QtNetwork QtOpenGL QtScript QtSql QtTest QtSvg QtWebKit"
@@ -43587,7 +43587,7 @@
     fi
 
     # Extract the first word of "moc-qt4", so it can be a program name with args.
-set dummy moc-qt4; ac_word=$2
+set dummy moc; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MOC4+set}" = set; then
@@ -43627,7 +43627,7 @@
 
 
     # Extract the first word of "uic-qt4", so it can be a program name with args.
-set dummy uic-qt4; ac_word=$2
+set dummy uic; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_UIC4+set}" = set; then
@@ -43683,7 +43683,7 @@
 fi
 
     if test x"${with_kde4_incl}" != x ; then
-    if test ! -f ${with_kde4_incl}/kapp.h ; then
+    if test ! -f ${with_kde4_incl}/kapplication.h ; then
       { { $as_echo "$as_me:$LINENO: error: ${with_kde4_incl} directory doesn't contain any KDE 4.x headers" >&5
 $as_echo "$as_me: error: ${with_kde4_incl} directory doesn't contain any KDE 4.x headers" >&2;}
    { (exit 1); exit 1; }; }
@@ -43704,7 +43704,7 @@
 fi
 
     if test x"${with_kde4_lib}" != x ; then
-    if test ! -f ${with_kde4_lib}/libkdeui.la; then
+    if test ! -f ${with_kde4_lib}/libkdeui.so; then
       { { $as_echo "$as_me:$LINENO: error: ${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!" >&5
 $as_echo "$as_me: error: ${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!" >&2;}
    { (exit 1); exit 1; }; }
@@ -44006,7 +44006,7 @@
 else
 
       if test x"${with_kde4_lib}" != x ; then
-        if test -f ${with_kde4_lib}/libkdeui.la; then
+        if test -f ${with_kde4_lib}/libkdeui.so; then
 	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
         else
 	        { { $as_echo "$as_me:$LINENO: error: ${with_kde4_lib} directory doesn't contain KDE 4.x libraries." >&5
@@ -44019,7 +44019,7 @@
 $as_echo_n "checking for kdeui library... " >&6; }
         kde4_topdir=
         for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
-          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then
+          if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
             kde4_topdir=$i
             { $as_echo "$as_me:$LINENO: result: ${kde4_topdir}/libkdeui" >&5
 $as_echo "${kde4_topdir}/libkdeui" >&6; }
@@ -53558,7 +53560,7 @@
       for j in ${boost_libs}; do
         dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 2>/dev/null`"
         if test -n "${dirs}"; then
-          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
+          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\-s::" -e "s:\.a::"`"
           if test x$dirname = x; then
             dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
            if test x"${dirname}" != "x/usr/lib"; then
@@ -53574,7 +53576,7 @@
     for j in ${extra_boost_libs}; do
       dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} ${dirname}/libboost_${j}*.a 2>/dev/null`"
       if test -n "${dirs}"; then
-          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
+          libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\-s::" -e "s:\.a::"`"
         ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
       else
         extra_missing_libs="${extra_missing_libs} $j"