[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 9413a074b12f7dacbd8d
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 9413a074b12f7dacbd8de8e11f0927269b4fd659 |
|
Date: |
Fri, 03 Dec 2010 23:50:48 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 9413a074b12f7dacbd8de8e11f0927269b4fd659 (commit)
via f0fd2e892d6c58bf1df3d3ced3fe08772e06f1a9 (commit)
via ace5aaa62e68c4947505e8af4ee6f1207959c7c2 (commit)
from 8c8d48db06020f69050458c7956f0e31fbe0ac89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=9413a074b12f7dacbd8de8e11f0927269b4fd659
commit 9413a074b12f7dacbd8de8e11f0927269b4fd659
Merge: f0fd2e8 8c8d48d
Author: Sandro Santilli <address@hidden>
Date: Sat Dec 4 00:49:26 2010 +0100
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=f0fd2e892d6c58bf1df3d3ced3fe08772e06f1a9
commit f0fd2e892d6c58bf1df3d3ced3fe08772e06f1a9
Author: Sandro Santilli <address@hidden>
Date: Sat Dec 4 00:41:21 2010 +0100
Use build_xxy in configure.ac, not macros
diff --git a/configure.ac b/configure.ac
index 62cfd7b..b50fbec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2321,13 +2321,17 @@ if test x"${build_qt3}" = xyes; then
GNASH_PATH_QT3
fi
-GNASH_PATH_KDE3
+if test x"${build_kde3}" = xyes; then
+ GNASH_PATH_KDE3
+fi
if test x"${build_qt4}" = xyes; then
GNASH_PATH_QT4
fi
-GNASH_PATH_KDE4
+if test x"${build_kde4}" = xyes; then
+ GNASH_PATH_KDE4
+fi
dnl Qtopia is a desktop environment for embedded devices.
dnl GNASH_PATH_QTOPIA3
diff --git a/macros/kde3.m4 b/macros/kde3.m4
index 3ce79e8..191cfce 100644
--- a/macros/kde3.m4
+++ b/macros/kde3.m4
@@ -74,7 +74,6 @@ AC_DEFUN([GNASH_PATH_KDE3],
])
dnl Look for the files necessary to build KDE 3.x applications
- if test x"${build_kde3}" = xyes; then
kde3_prefix=
AC_PATH_PROG(KDE3_CONFIG, kde-config, ,[${pathlist}])
if test "x$KDE3_CONFIG" != "x" ; then
@@ -98,19 +97,11 @@ AC_DEFUN([GNASH_PATH_KDE3],
if test -f $i/kde/kapplication.h; then
ac_cv_path_kde3_incl="-I$i/kde"
kde3_prefix=`dirname $i`
- if test ! -f $i/kde/qxembed.h -a x"${build_kde4}" = x"no"; then
- AC_MSG_ERROR([You specified building kde3, but you have kde4
installed!])
- break
- fi
break
fi
if test -f $i/kapplication.h; then
ac_cv_path_kde3_incl="-I$i"
kde3_prefix=`dirname $i`
- if test ! -f $i/qxembed.h -a x"${build_kde4}" = x"no"; then
- AC_MSG_ERROR([You specified building kde3, but you have kde4
installed!])
- break
- fi
break
fi
done
@@ -177,12 +168,10 @@ AC_DEFUN([GNASH_PATH_KDE3],
ac_cv_path_kde3_lib="${ac_cv_path_kde3_lib} ${libkdeprint}"
fi
]) dnl end of cache ac_cv_path_kde3_lib
- fi dnl end of build_kde3
KLASH_PLUGIN=
dnl If building the kparts plugin, get the install paths correct.
- if test x$build_kparts3 = xyes; then
AC_CACHE_VAL(ac_cv_path_kde3_prefix,[
dnl if the user specified a path, sanity check it and then use it
if test x"${with_kde3_prefix}" != x; then
@@ -209,7 +198,6 @@ AC_DEFUN([GNASH_PATH_KDE3],
KDE3_SERVICESDIR="${KDE3_PREFIX}/share/services"
KDE3_CONFIGDIR="${KDE3_PREFIX}/share/config"
KDE3_APPSDATADIR="${KDE3_PREFIX}/share/apps/klash"
- fi dnl end of build_kparts3
if test x"${ac_cv_path_kde3_incl}" != x ; then
if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
diff --git a/macros/kde4.m4 b/macros/kde4.m4
index 258d8ef..4e55d20 100644
--- a/macros/kde4.m4
+++ b/macros/kde4.m4
@@ -75,7 +75,6 @@ AC_DEFUN([GNASH_PATH_KDE4],
dnl Only run these tests if this version was specified by the user, and they
dnl haven't spcified a custom path.
- if test x"${build_kde4}" = xyes; then
kde4_prefix=
dnl FreeBSD puts kde4-config in /usr/local
pathlist="${pathlist}:/usr/local/kde4/bin"
@@ -106,17 +105,11 @@ AC_DEFUN([GNASH_PATH_KDE4],
if test -f $i/kde/kapplication.h; then
ac_cv_path_kde4_incl="-I$i/kde"
kde4_prefix=`dirname $i`
- if test -f $i/kde/qxembed.h -a x"${build_kde3}" = x"no"; then
- AC_MSG_ERROR([You specified building kde4, but you have kde3
installed!])
- fi
break
fi
if test -f $i/kapplication.h; then
ac_cv_path_kde4_incl="-I$i"
kde4_prefix=`dirname $i`
- if test -f $i/qxembed.h -a x"${build_kde3}" = x"no"; then
- AC_MSG_ERROR([You specified building kde4, but you have kde3
installed!])
- fi
break
fi
done
@@ -170,12 +163,10 @@ AC_DEFUN([GNASH_PATH_KDE4],
fi
fi
]) dnl end of cache ac_cv_path_kde4_lib
- fi dnl end of build_kde4
KLASH_PLUGIN=
dnl If building the kparts plugin, get the install paths correct.
- if test x$build_kparts4 = xyes; then
AC_CACHE_VAL(ac_cv_path_kde4_prefix,[
dnl if the user specified a path, sanity check it and then use it
if test x"${with_kde4_prefix}" != x; then
@@ -218,7 +209,6 @@ AC_DEFUN([GNASH_PATH_KDE4],
else
KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
fi
- fi dnl end of build_kparts4
if test x"${ac_cv_path_kde4_incl}" != x ; then
if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
http://git.savannah.gnu.org/cgit//commit/?id=ace5aaa62e68c4947505e8af4ee6f1207959c7c2
commit ace5aaa62e68c4947505e8af4ee6f1207959c7c2
Author: Sandro Santilli <address@hidden>
Date: Sat Dec 4 00:36:07 2010 +0100
Do not use build_qt3 and build_qt4 variables within GNASH_PATH_QT3 and
GNASH_PATH_QT4, rather avoid calling that macro as a whole if those variables
aren't set to request such builds
diff --git a/configure.ac b/configure.ac
index e783e2d..62cfd7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2317,10 +2317,16 @@ fi
AM_CONDITIONAL(HAVE_SDL, [ test x$has_SDL = xyes ])
-GNASH_PATH_QT3
+if test x"${build_qt3}" = xyes; then
+ GNASH_PATH_QT3
+fi
+
GNASH_PATH_KDE3
-GNASH_PATH_QT4
+if test x"${build_qt4}" = xyes; then
+ GNASH_PATH_QT4
+fi
+
GNASH_PATH_KDE4
dnl Qtopia is a desktop environment for embedded devices.
diff --git a/macros/qt3.m4 b/macros/qt3.m4
index 2883aab..8566c01 100644
--- a/macros/qt3.m4
+++ b/macros/qt3.m4
@@ -42,7 +42,7 @@ AC_DEFUN([GNASH_PATH_QT3],
dnl Only run these tests if this version was specified by the user, and they
dnl haven't spcified a custom path.
- if test x"${build_qt3}" = xyes -a x"${ac_cv_path_qt3_incl}" = x; then
+ if x"${ac_cv_path_qt3_incl}" = x; then
dnl if QTDIR is set in the users environment, use that, as that's what
dnl most QT programmers do, as it's required by the QT build system.
qt_pkg="qt-mt"
@@ -144,7 +144,7 @@ dnl # QT_LIBS = -lqtui -lqtcore -lqtprint
-L/usr/lib/qt-3.3/lib -lqt-mt
AC_PATH_PROG(MOC3, moc, ,[ /usr/lib/qt-3.3/bin ${QTDIR}/bin${pathlist}])
- fi dnl end of build_qt3
+ fi dnl end of ${ac_cv_path_qt3_incl} empty
AC_SUBST(MOC3)
AC_SUBST(QT3_CFLAGS)
diff --git a/macros/qt4.m4 b/macros/qt4.m4
index e3c1060..6203525 100644
--- a/macros/qt4.m4
+++ b/macros/qt4.m4
@@ -41,7 +41,6 @@ AC_DEFUN([GNASH_PATH_QT4], [
]) dnl end of cache ac_cv_path_qt4_incl
dnl Only run these tests if this version was specified by the user.
- if test x"${build_qt4}" = xyes; then
if test x"${ac_cv_path_qt4_incl}" = x; then
dnl if QTDIR is set in the users environment, use that, as that's what
@@ -184,7 +183,6 @@ dnl fi
AC_SUBST([QT4_LIBS])
AC_SUBST([MOC4])
AC_SUBST([UIC4])
- fi dnl end of build_qt4
]) dnl end of defun GNASH_PATH_QT4
dnl dnl Find the QT 4.x libQtCore library
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 18 ++++++++++++++----
macros/kde3.m4 | 12 ------------
macros/kde4.m4 | 10 ----------
macros/qt3.m4 | 4 ++--
macros/qt4.m4 | 2 --
5 files changed, 16 insertions(+), 30 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 9413a074b12f7dacbd8de8e11f0927269b4fd659,
Sandro Santilli <=