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

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/03/20 20:27:29

Modified files:
        .              : configure.ac ChangeLog 
        macros         : kde.m4 

Log message:
        Remove duplicate of presence tests for JPEG KDE QT.
        Say what to install for KDE QT MYSQL.
        Fix broken QT detection on Debian.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.273&r2=1.274
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2655&r2=1.2656
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -b -r1.273 -r1.274
--- configure.ac        16 Mar 2007 21:31:33 -0000      1.273
+++ configure.ac        20 Mar 2007 20:27:29 -0000      1.274
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.273 2007/03/16 21:31:33 strk Exp $
+dnl $Id: configure.ac,v 1.274 2007/03/20 20:27:29 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1013,9 +1013,11 @@
     echo "        KDE libs are: $KDE_LIBS"
   else
     if test x$gui = xkde -o x$klash = xyes ; then
-      echo "        ERROR: No kde development package installed!"
-      echo "               Reconfigure with --disable-klash to continue"
-      echo "               and/or change to a different gui"
+      echo "        ERROR: No KDE development package installed!"
+      echo "               Reconfigure with --disable-klash and/or"
+      echo "               change to a different gui with --enable-gui=..."
+      echo "               or install the KDE development environment, or"
+      echo "               install kdelibs-dev (using apt-get) or 
something-else (using yum)."
       nogo=true
     fi
   fi
@@ -1024,9 +1026,18 @@
     echo "        QT libs are: $QT_LIBS"
   else
     if test x$gui = xkde -o x$klash = xyes ; then
+      if test x"$has_kde" != xyes; then
+       # We have already moaned about KDE absence, so presumably they'll get
+       # QT-dev when they install KDE-dev
+       :
+      else
+       # This should never happen unless they have a very odd version of KDE
       echo "        ERROR: No QT development package installed!"
-      echo "               Reconfigure with --disable-klash to continue"
-      echo "               and/or change to a different gui"
+        echo "               Reconfigure with --disable-klash and/or"
+        echo "               change to a different gui with --enable-gui=..."
+        echo "               or install a QT development environment, or"
+        echo "               install libqt3-mt-dev (using apt-get) or 
something-else (using yum)."
+      fi
       nogo=true
     fi
   fi
@@ -1041,6 +1052,8 @@
   echo "        JPEG libs are: $JPEG_LIBS"
 else
   echo "        ERROR: No JPEG library development package installed!"
+  echo "        You need to have the libjpeg package installed to compile, or"
+  echo "        install libjpeg-dev (using apt-get) or libjpeg-devel (using 
yum)."
   nogo=true
 fi
 
@@ -1408,17 +1421,6 @@
  nogo=true
 fi
 
-if test x"$JPEG_LIBS" != x; then
-    echo "        JPEG flags are: $JPEG_CFLAGS"
-    echo "        JPEG libs are: $JPEG_LIBS"
-else
-    echo "ERROR: No JPEG development package installed!\
- You need to have the libjpeg package installed\
- to compile, or install libjpeg-dev (using apt-get)\
- or libjpeg-devel (using yum)."
- nogo=true
-fi
-
 if test x"$MING_LIBS" != x; then
     echo "        MING version code is $MING_VERSION_CODE"
     echo "        MING flags are $MING_CFLAGS"
@@ -1457,38 +1459,15 @@
  to play compressed SWF (most of them from version 6 up). "
 fi
 
-if test x$kde = xyes -o x$klash = xyes; then
-  if test x"$has_kde" = xyes; then
-    echo "        KDE flags are: $KDE_CFLAGS"
-    echo "        KDE libs are: $KDE_LIBS"
-  else
-    if test x$gui = xkde -o x$klash = xyes ; then
-      echo "        ERROR: No kde development package installed!"
-      echo "               Reconfigure with --disable-klash to continue"
-      echo "               and/or change to a different gui"
-      nogo=true
-    fi
-  fi
-  if test x"$has_qt" = xyes; then
-    echo "        QT flags are: $QT_CFLAGS"
-    echo "        QT libs are: $QT_LIBS"
-  else
-    if test x$gui = xkde -o x$klash = xyes ; then
-      echo "        ERROR: No QT development package installed!"
-      echo "               Reconfigure with --disable-klash to continue"
-      echo "               and/or change to a different gui"
-      nogo=true
-    fi
-  fi
-fi
-
 if test x$extensions = xyes; then
   if test x$mysql != xno; then
     if test x"$MYSQL_LIBS" != x; then
       echo "        MYSQL flags are: $MYSQC_CFLAGS"
       echo "        MYSQL libs are: $MYSQL_LIBS"
     else
-      echo "        ERROR: No MySQL development package installed!"
+      echo "        ERROR: No MySQL development package is installed."
+      echo "               Either reconfigure with --disable-extensions, or 
install"
+      echo "               libmysqlclient-dev (using apt-get) or 
something-else (using yum)"
     fi
   fi
 fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2655
retrieving revision 1.2656
diff -u -b -r1.2655 -r1.2656
--- ChangeLog   20 Mar 2007 19:57:35 -0000      1.2655
+++ ChangeLog   20 Mar 2007 20:27:29 -0000      1.2656
@@ -1,3 +1,11 @@
+2007-03-20 Martin Guy <address@hidden>
+
+       * configure.ac:
+         Remove duplicate of presence tests for JPEG KDE QT.
+         Say what to install for KDE QT MYSQL.
+       * configure.ac macros/kde.m4:
+         Fix broken QT detection on Debian.
+
 2007-03-20 Ann Barcomb <address@hidden>
 
        * server/asobj/gen-asclass.pl: Produces exactly the same output
@@ -52,6 +60,7 @@
        * testsuite/actionscript.all/Function.as:
          Couple of more successes.
 
+>>>>>>> 1.2655
 2007-03-20 Sandro Santilli <address@hidden>
 
        * server/array.cpp, server/as_environment.cpp,

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/kde.m4       6 Mar 2007 18:06:13 -0000       1.27
+++ macros/kde.m4       20 Mar 2007 20:27:29 -0000      1.28
@@ -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.27 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: kde.m4,v 1.28 2007/03/20 20:27:29 martinwguy Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -176,12 +176,32 @@
         break
       fi
     done
+
+    if test "x$gnash_qt_version" != x; then
+      break;
+    fi
+  done
+
+dnl On Debian the dir is /usr/include/qt3 with /usr/lib/libqt-mt.*
+dnl so we set topdir to /usr so that $topdir/lib/libqt-mt.* works below,
+dnl and version to 3 or whatever.
+dnl incllist is inherited from configure.ac.
+  if test "x$gnash_qt_version" == x; then
+    for i in $incllist; do
+      for j in `ls -dr $i/qt[[0-9]] 2>/dev/null`; do
+        if test -f $j/qobject.h; then
+          gnash_qt_topdir=`echo "$i" | sed 's:/include::'`
+          gnash_qt_version=`echo "$j" | sed "s:$i/qt::"`
+          ac_cv_path_qt_incl="-I$j"
+          break
+        fi
+      done
     if test x$gnash_qt_version != x; then
       break;
     fi
   done
+  fi
 
-  dnl incllist is inherited from configure.ac.
   if test x"${ac_cv_path_qt_incl}" = x; then
     AC_MSG_RESULT(no)
   else
@@ -210,9 +230,12 @@
   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.so ; then
-      AC_MSG_RESULT(${gnash_qt_topdir}/lib/libqt-mt)
       ac_cv_path_qt_lib="-L${gnash_qt_topdir}/lib -lqt-mt"
-      break
+    fi
+    if test x"${ac_cv_path_qt_lib}" != x; then
+      AC_MSG_RESULT(${gnash_qt_topdir}/lib/libqt-mt)
+    else
+      AC_MSG_RESULT(no)
     fi
   fi