[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/kde.m4
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog macros/kde.m4 |
Date: |
Fri, 22 Jun 2007 14:31:13 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/06/22 14:31:13
Modified files:
. : ChangeLog
macros : kde.m4
Log message:
look for libkdeui, not kdeui. Also first check
in the QTDIR/bin directory for moc, in case the first moc in
PATH
is not the qt3 one.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3599&r2=1.3600
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3599
retrieving revision 1.3600
diff -u -b -r1.3599 -r1.3600
--- ChangeLog 22 Jun 2007 08:25:17 -0000 1.3599
+++ ChangeLog 22 Jun 2007 14:31:12 -0000 1.3600
@@ -1,3 +1,9 @@
+2007-06-22 Bastiaan Jacques <address@hidden>
+
+ * macros/kde.m4: look for libkdeui, not kdeui. Also first check
+ in the QTDIR/bin directory for moc, in case the first moc in PATH
+ is not the qt3 one.
+
2007-06-22 Zou Lunkai <address@hidden>
* testsuite/actionscript.all/enumerate.as: more tests.
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- macros/kde.m4 4 Jun 2007 18:00:09 -0000 1.32
+++ macros/kde.m4 22 Jun 2007 14:31:13 -0000 1.33
@@ -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.32 2007/06/04 18:00:09 rsavoye Exp $
+dnl $Id: kde.m4,v 1.33 2007/06/22 14:31:13 bjacques 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}/kdeui.${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.])
@@ -145,12 +145,10 @@
has_kde=no
fi
- AC_PATH_PROG(MOC, moc, ,[${pathlist}])
KLASH_PLUGIN=
AC_SUBST(KLASH_PLUGIN)
- AC_SUBST(MOC)
AC_SUBST(KDE_CFLAGS)
AC_SUBST(KDE_LIBS)
])
@@ -256,6 +254,10 @@
has_qt="no"
fi
+ AC_PATH_PROG(MOC, moc, ,[${gnash_qt_topdir}/bin ${pathlist}])
+
+ AC_SUBST(MOC)
+
AC_SUBST(QT_CFLAGS)
AC_SUBST(QT_LIBS)
])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog macros/kde.m4,
Bastiaan Jacques <=