[Gnash-commit] gnash/macros kde.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/09/11 04:17:18

Modified files:
        macros         : kde.m4 

Log message:
        Use ls to find QT libs too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- kde.m4      11 Sep 2007 00:17:44 -0000      1.39
+++ kde.m4      11 Sep 2007 04:17:17 -0000      1.40
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: kde.m4,v 1.39 2007/09/11 00:17:44 rsavoye Exp $
+dnl $Id: kde.m4,v 1.40 2007/09/11 04:17:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -225,7 +225,7 @@
   AC_ARG_WITH(qt_lib, AC_HELP_STRING([--with-qt-lib], [directory where qt 
libraries are]), with_qt_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_qt_lib, [
     if test x"${with_qt_lib}" != x ; then
-      if test -f ${with_qt_lib}/libqt-mt.q -o -f 
${with_qt_lib}/libqt-mt.${shlibext}; then
+      if test `ls -C1 ${gnash_qt_topdir}/lib/libqt-mt.*| wc -l` -gt 0 ; then
              ac_cv_path_qt_lib="-L`(cd ${with_qt_lib}; pwd)` -lqt-mt"
       else
              AC_MSG_ERROR([${with_qt_lib} directory doesn't contain qt 
libraries.])
@@ -235,7 +235,7 @@
 
   if test x"${ac_cv_path_qt_lib}" = x; then
     AC_MSG_CHECKING([for qt library])
-    if test -f ${gnash_qt_topdir}/lib/libqt-mt.a -o -f 
${gnash_qt_topdir}/lib/libqt-mt.${shlibext} ; then
+    if test `ls -C1 ${gnash_qt_topdir}/lib/libqt-mt.*| wc -l` -gt 0 ; then
       ac_cv_path_qt_lib="-L${gnash_qt_topdir}/lib -lqt-mt"
     fi
     if test x"${ac_cv_path_qt_lib}" != x; then