[Gnash-commit] gnash/macros qtopia.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/11/29 04:37:38

Modified files:
        macros         : qtopia.m4 

Log message:
        Fix bad merge.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/qtopia.m4?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: qtopia.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/qtopia.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- qtopia.m4   29 Nov 2007 03:47:05 -0000      1.5
+++ qtopia.m4   29 Nov 2007 04:37:38 -0000      1.6
@@ -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: qtopia.m4,v 1.5 2007/11/29 03:47:05 rsavoye Exp $
+dnl $Id: qtopia.m4,v 1.6 2007/11/29 04:37:38 rsavoye Exp $
 
 dnl address@hidden pts/8> QtCore  QtSvg Qtnetwork QtXml 
 dnl QtCore: Command not found.
@@ -100,13 +100,8 @@
   fi
   
   dnl this a sanity check for Qtopia 4
-<<<<<<< qtopia.m4
   qt_headers="QtXml QtGui QtCore QtNetwork QtSql"
-  if test $gnash_qtopia_version -eq 4; then
-=======
-  qt_headers="QtXml QtGui QtCore"
   if test "${gnash_qtopia_version} " -eq 4; then
->>>>>>> 1.4
     if test x"${ac_cv_path_qtopia_incl}" != x; then
       for i in $qt_headers; do
         if ! test -d ${gnash_qtopia_topdir}/qtopiacore/target/include/$i; then
@@ -150,13 +145,8 @@
   
   AC_MSG_CHECKING([Sanity checking the Qtopia installation])
   dnl this a sanity check for Qtopia 2
-<<<<<<< qtopia.m4
   qt_libs="libqtopia libqpe"
-  if test $gnash_qtopia_version -eq 2; then
-=======
-  qt_libs="libqt libqtopia libqpe"
   if test "${gnash_qtopia_version} " -eq 2; then
->>>>>>> 1.4
     AC_DEFINE([GNASH_QTOPIA_VERSION], 2, [The Qtopia version])
     if test x"${ac_cv_path_qtopia_lib}" != x; then
       for i in $qt_libs; do