[Gnash-commit] gnash macros/kde.m4 ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/09/10 14:34:11

Modified files:
        macros         : kde.m4 
        .              : ChangeLog 

Log message:
        Remove bogus patch. Can't use * with test!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4261&r2=1.4262

Patches:
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- macros/kde.m4       9 Sep 2007 15:47:42 -0000       1.37
+++ macros/kde.m4       10 Sep 2007 14:34:10 -0000      1.38
@@ -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.37 2007/09/09 15:47:42 rsavoye Exp $
+dnl $Id: kde.m4,v 1.38 2007/09/10 14:34:10 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -84,7 +84,7 @@
   AC_ARG_WITH(kde_lib, AC_HELP_STRING([--with-kde-lib], [directory where kde 
libraries are]), with_kde_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_kde_lib, [
     if test x"${with_kde_lib}" != x ; then
-      if test -f ${with_kde_lib}/libkdeui.a -o -f 
${with_kde_lib}/libkdeui.${shlibext}*; then
+      if test -f ${with_kde_lib}/libkdeui.a -o -f 
${with_kde_lib}/libkdeui.${shlibext}; then
              ac_cv_path_kde_lib="-L`(cd ${with_kde_lib}; pwd)`"
       else
              AC_MSG_ERROR([${with_kde_lib} directory doesn't contain kde 
libraries.])
@@ -97,7 +97,7 @@
     topdir=""
     newlist="${kde_prefix}/lib ${libslist}"
     for i in $newlist ; do
-      if test -f $i/libkdeui.a -o -f $i/libkdeui.${shlibext}* ; then
+      if test -f $i/libkdeui.a -o -f $i/libkdeui.${shlibext} ; then
         topdir=$i
         AC_MSG_RESULT(${topdir}/libkdeui)
              if test x"$i" != x"/usr/lib"; then
@@ -114,7 +114,7 @@
   dnl Look for the kdecore library, which is required
   if test x"${ac_cv_path_kde_lib}" != x; then
     AC_MSG_CHECKING([for kdecore library])
-    if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.${shlibext}*; 
then
+    if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.${shlibext}; 
then
       ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdecore"
       AC_MSG_RESULT(${topdir}/libkdecore)
     else
@@ -124,7 +124,7 @@
     dnl Look for the kdeprint library, which is required
     AC_MSG_CHECKING([for kdeprint library])
     if test x"${libkdeprint}" = x; then
-      if test -f ${topdir}/libkdeprint.a -o -f 
${topdir}/libkdeprint.${shlibext}*; then
+      if test -f ${topdir}/libkdeprint.a -o -f 
${topdir}/libkdeprint.${shlibext}; then
         ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdeprint"
         AC_MSG_RESULT(${topdir}/libkdeprint)
       else
@@ -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 -f ${with_qt_lib}/libqt-mt.q -o -f 
${with_qt_lib}/libqt-mt.${shlibext}; 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 -f ${gnash_qt_topdir}/lib/libqt-mt.a -o -f 
${gnash_qt_topdir}/lib/libqt-mt.${shlibext} ; then
       ac_cv_path_qt_lib="-L${gnash_qt_topdir}/lib -lqt-mt"
     fi
     if test x"${ac_cv_path_qt_lib}" != x; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4261
retrieving revision 1.4262
diff -u -b -r1.4261 -r1.4262
--- ChangeLog   10 Sep 2007 14:27:45 -0000      1.4261
+++ ChangeLog   10 Sep 2007 14:34:10 -0000      1.4262
@@ -23,11 +23,6 @@
        * server/parser/shape_character_def.cpp: Be sure to read
          on alignment where needed.
 
-2007-09-09  Rob Savoye  <address@hidden>
-
-       * macros/kde.m4: Look for shared libraries that don't end in
-         .so. patch #6191.
-
 2007-09-08 Sandro Santilli <address@hidden>
 
        * server/parser/video_stream_def.h: document class members,