[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-365-g69c9f24

[Sandro Santilli]

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  69c9f248ae8576bc9d884d1ddfc11cd5f9f582f3 (commit)
       via  2f7d6860a5a2d4cdfe200d4d6d2ae8c7dc66621a (commit)
       via  9788261146800341cd07cdde973b2470791b1683 (commit)
      from  aa7597ee438487d97763b7e631cb52c58feca6eb (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=69c9f248ae8576bc9d884d1ddfc11cd5f9f582f3


commit 69c9f248ae8576bc9d884d1ddfc11cd5f9f582f3
Author: Jonas 'Sortie' Termansen <address@hidden>
Date:   Fri Jun 3 18:14:33 2011 +0200

    Recommend installing the libspeexdsp library when configuring. Note: on 
debian-ish platforms, this is distributed separately from libspeex, while on 
RPM-platforms they are distributed together.

diff --git a/configure.ac b/configure.ac
index b7c071a..ee76011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3316,6 +3316,21 @@ else
   echo "                     or .rpm users: yum install speex-devel" >&5
 fi
 
+if test x"$SPEEXDSP_LIBS" != x; then
+  if test x"$SPEEXDSP_CFLAGS" != x; then
+    echo "        Speex DSP flags are: $SPEEXDSP_CFLAGS"
+  else
+    echo "        Speex DSP flags are: default include path"
+  fi
+    echo "        Speex DSP libs are: $SPEEXDSP_LIBS"
+else
+  echo "        RECOMMENDED: If you install the Speex DSP library, Gnash will 
be able" >&5
+  echo "                     to resample Speex encoded audio in FLV files." >&5
+  echo "                     Install libspeexdsp from http://speex.org"; >&5
+  echo "                     or .deb users: apt-get install libspeexdsp-dev" 
>&5
+  echo "                     or .rpm users: yum install speex-devel" >&5
+fi
+
 if test x"$ext_dbus" = xyes; then
   if test x"$DBUS_LIBS" != x; then
     if test x"$DBUS_CFLAGS" != x; then

http://git.savannah.gnu.org/cgit//commit/?id=2f7d6860a5a2d4cdfe200d4d6d2ae8c7dc66621a


commit 2f7d6860a5a2d4cdfe200d4d6d2ae8c7dc66621a
Author: Jonas 'Sortie' Termansen <address@hidden>
Date:   Fri Jun 3 18:19:21 2011 +0200

    Require the development headers to be installed to use qt, and not just use 
qt if the library is installed. Installing qt in a manner that these files 
would detect, while not having the dev files around, will let configure allow 
building the qt gui, but the build will break.

diff --git a/macros/qt3.m4 b/macros/qt3.m4
index d1864d7..569dd7e 100644
--- a/macros/qt3.m4
+++ b/macros/qt3.m4
@@ -135,12 +135,19 @@ dnl   # QT_LIBS =  -lqtui -lqtcore -lqtprint 
-L/usr/lib/qt-3.3/lib -lqt-mt
     fi
 
     if test x"${ac_cv_path_qt3_lib}" != x; then
-      QT3_LIBS="${ac_cv_path_qt3_lib}"
+      AC_MSG_RESULT(${ac_cv_path_qt3_lib})
+    else
+      AC_MSG_RESULT(no)
+    fi
+
+    dnl Both the headers and the library must be installed
+    if test x"${ac_cv_path_qt3_incl}" != x -a x"${ac_cv_path_qt3_lib}" != x; 
then
       AC_DEFINE(HAVE_QT3, 1, [Have QT 3.x installed])
+      QT3_LIBS="${ac_cv_path_qt3_lib}"
       has_qt3="yes"
     else
-      QT3_LIBS=""
       has_qt3="no"
+      QT3_LIBS=""
     fi
 
     AC_PATH_PROG(MOC3, moc, ,[ /usr/lib/qt-3.3/bin ${QTDIR}/bin${pathlist}])
diff --git a/macros/qt4.m4 b/macros/qt4.m4
index 455ac32..ba47e77 100644
--- a/macros/qt4.m4
+++ b/macros/qt4.m4
@@ -166,13 +166,18 @@ dnl   fi
 
     if test x"${ac_cv_path_qt4_lib}" != x; then
       AC_MSG_RESULT(${ac_cv_path_qt4_lib})
-      QT4_LIBS="${ac_cv_path_qt4_lib}"
+    else
+      AC_MSG_RESULT(no)
+    fi
+
+    dnl Both the headers and the library must be installed
+    if test x"${ac_cv_path_qt4_incl}" != x -a x"${ac_cv_path_qt4_lib}" != x; 
then
       AC_DEFINE(HAVE_QT4, 1, [Have QT 4.x installed])
+      QT4_LIBS="${ac_cv_path_qt4_lib}"
       has_qt4="yes"
     else
-      AC_MSG_RESULT(no)
-      QT4_LIBS=""
       has_qt4="no"
+      QT4_LIBS=""
     fi
 
     AC_PATH_PROGS(MOC4, [moc-qt4 moc moc4], ,[/usr/bin ${QTDIR}/bin 
/usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])

http://git.savannah.gnu.org/cgit//commit/?id=9788261146800341cd07cdde973b2470791b1683


commit 9788261146800341cd07cdde973b2470791b1683
Author: Jonas 'Sortie' Termansen <address@hidden>
Date:   Fri Jun 3 18:08:08 2011 +0200

    Require headers to be installed before allowing linking. This prevents a 
bug where the library is found, but no headers are found, but the compile still 
continues, and not ./configure telling the user to install the library's 
development files.

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index ef636a3..9998e9a 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -161,7 +161,7 @@ pushdef([DASHDOWN], translit([$1], [A-Z_], [a-z-]))dnl 
Lowercase
 has_$1=no
 ac_manual=yes
 
-if test x"${$1}" = x"yes"; then
+if test x"${$1}" = x"yes" -a x"${found_$1_incl}" = "xyes"; then
   dnl Look for the library
   AC_ARG_WITH($1_lib, AC_HELP_STRING([--with-$1-lib], [directory where $1 
library is]), with_$1_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_$1_lib,[

-----------------------------------------------------------------------

Summary of changes:
 configure.ac           |   15 +++++++++++++++
 macros/gnashpkgtool.m4 |    2 +-
 macros/qt3.m4          |   11 +++++++++--
 macros/qt4.m4          |   11 ++++++++---
 4 files changed, 33 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash