[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/boost.m4 macros/curl.m4 ...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ChangeLog macros/boost.m4 macros/curl.m4 ... |
|
Date: |
Tue, 11 Sep 2007 00:17:44 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/09/11 00:17:44
Modified files:
. : ChangeLog
macros : boost.m4 curl.m4 ffmpeg.m4 gnashpkgtool.m4
gtk2.m4 gtkglext.m4 kde.m4 pango.m4
Log message:
* macros/curl.m4: sed any "-L/usr/lib" off the output of
curl-config. This breaks some 64 bit systems.
* macros/kde.m4: Do an ls instead of a test to find kde
libraries.
* macros/pango.m4, gtk2.m4, gnashpkgtool.m4, ffmpeg.m4: Use
--libs-only-l with pkg-config as sometimes the path is wrong for
64bit systems.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4264&r2=1.4265
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.25&r2=1.26
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4264
retrieving revision 1.4265
diff -u -b -r1.4264 -r1.4265
--- ChangeLog 10 Sep 2007 17:15:00 -0000 1.4264
+++ ChangeLog 11 Sep 2007 00:17:43 -0000 1.4265
@@ -1,3 +1,12 @@
+2007-09-10 Rob Savoye <address@hidden>
+
+ * macros/curl.m4: sed any "-L/usr/lib" off the output of
+ curl-config. This breaks some 64 bit systems.
+ * macros/kde.m4: Do an ls instead of a test to find kde libraries.
+ * macros/pango.m4, gtk2.m4, gnashpkgtool.m4, ffmpeg.m4: Use
+ --libs-only-l with pkg-config as sometimes the path is wrong for
+ 64bit systems.
+
2007-09-10 Sandro Santilli <address@hidden>
* server/parser/morph2_character_def.cpp (read):
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- macros/boost.m4 2 Sep 2007 23:48:37 -0000 1.53
+++ macros/boost.m4 11 Sep 2007 00:17:43 -0000 1.54
@@ -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: boost.m4,v 1.53 2007/09/02 23:48:37 nihilus Exp $
+dnl $Id: boost.m4,v 1.54 2007/09/11 00:17:43 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -142,38 +142,6 @@
BOOST_CFLAGS="$ac_cv_path_boost_incl"
BOOST_LIBS="$ac_cv_path_boost_lib"
- dnl ---------------------------------------
- dnl Check actual usability of headers
- dnl (if not cross-compiling)
- dnl ---------------------------------------
-
- dnl Bogus testing
- dnl if test x${cross_compiling} = xno; then
- dnl AC_LANG_PUSH(C++)
- dnl save_CXXFLAGS="$CXXFLAGS"
- dnl save_CPPFLAGS="$CPPFLAGS"
- dnl CXXFLAGS="$CFLAGS $BOOST_CFLAGS"
- dnl CPPFLAGS="$CXXFLAGS"
- dnl AC_CHECK_HEADERS([boost/thread.hpp], [], [boost_thread=no])
- dnl CXXFLAGS="$save_CXXFLAGS"
- dnl CPPFLAGS="$save_CPPFLAGS"
- dnl AC_LANG_POP(C++)
- dnl fi # if not cross-compiling
-
- dnl ---------------------------------------
- dnl TODO: Check actual usability of libs
- dnl ---------------------------------------
-
- if test x${cross_compiling} = xno; then
- dnl Two problems:
- dnl 1) knowing the name of the required libs
- dnl (needs storing the name when finding it
- dnl at the beginning of this macro)
- dnl 2) check how to use AC_CHECK_LIB for C++ libs
- :
- fi # if not cross-compiling
-
-
dnl ------------------------------------------------------------------
dnl Set HAVE_BOOST conditional, BOOST_CFLAGS and BOOST_LIBS variables
dnl ------------------------------------------------------------------
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/curl.m4 1 Jul 2007 10:54:11 -0000 1.17
+++ macros/curl.m4 11 Sep 2007 00:17:43 -0000 1.18
@@ -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: curl.m4,v 1.17 2007/07/01 10:54:11 bjacques Exp $
+dnl $Id: curl.m4,v 1.18 2007/09/11 00:17:43 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -94,7 +94,7 @@
dnl curl-config gives us way to many libraries, which create nasty
linking
dnl dependancy issue, so we strip them off here. The real dependencies
are
dnl are taken care of by other config tests.
- ac_cv_path_curl_lib=`${curlconfig} --libs | sed -e 's/lcurl.*/lcurl/'`
+ ac_cv_path_curl_lib=`${curlconfig} --libs | sed -e 's/lcurl.*/lcurl/' -e
's:-L/usr/lib ::'`
else # }{
AC_MSG_CHECKING([for libcurl library])
for i in $libslist; do # {
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- macros/ffmpeg.m4 29 Jul 2007 04:40:34 -0000 1.50
+++ macros/ffmpeg.m4 11 Sep 2007 00:17:44 -0000 1.51
@@ -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: ffmpeg.m4,v 1.50 2007/07/29 04:40:34 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.51 2007/09/11 00:17:44 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -221,7 +221,7 @@
dnl Try with pkg-config
if test x"${cross_compiling}" = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
- $PKG_CONFIG --exists libavcodec && libavcodec=`$PKG_CONFIG --libs
libavcodec`
+ $PKG_CONFIG --exists libavcodec && libavcodec=`$PKG_CONFIG --libs-only-l
libavcodec`
fi
fi
@@ -261,7 +261,7 @@
if test x"${ac_cv_path_ffmpeg_lib}" != x; then
AC_MSG_CHECKING([for libdts library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists libdts && libdts=`$PKG_CONFIG --libs libdts`
+ $PKG_CONFIG --exists libdts && libdts=`$PKG_CONFIG --libs-only-l libdts`
else
libdts=""
fi
@@ -283,7 +283,7 @@
dnl Look for the VORBISENC library, which is required on some systems.
AC_MSG_CHECKING([for libvorbisenc library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists vorbisenc && libvorbisenc=`$PKG_CONFIG --libs
vorbisenc`
+ $PKG_CONFIG --exists vorbisenc && libvorbisenc=`$PKG_CONFIG
--libs-only-l vorbisenc`
else
libvorbisenc=""
fi
@@ -305,7 +305,7 @@
dnl Look for the AVFORMAT library, which is required on some systems.
AC_MSG_CHECKING([for libavformat library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG --libs
libavformat`
+ $PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG
--libs-only-l libavformat`
else
libavformat=""
fi
@@ -327,7 +327,7 @@
dnl Look for the AVUTIL library, which is required on some systems.
AC_MSG_CHECKING([for libavutil library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs
libavutil`
+ $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs-only-l
libavutil`
else
libavutil=""
fi
@@ -349,7 +349,7 @@
dnl Look for the THEORA library, which is required on some systems.
AC_MSG_CHECKING([for libtheora library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists theora && libtheora=`$PKG_CONFIG --libs theora`
+ $PKG_CONFIG --exists theora && libtheora=`$PKG_CONFIG --libs-only-l
theora`
else
libtheora=""
fi
@@ -371,7 +371,7 @@
dnl Look for the GSM library, which is required on some systems.
AC_MSG_CHECKING([for libgsm library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs gsm`
+ $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs-only-l gsm`
else
libgsm=""
fi
@@ -393,7 +393,7 @@
dnl Look for the DC1394 library, which is required on some systems.
AC_MSG_CHECKING([for libdc1394 library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists libdc && libdc=`$PKG_CONFIG --libs libdc1394`
+ $PKG_CONFIG --exists libdc && libdc=`$PKG_CONFIG --libs-only-l
libdc1394`
else
libtdc=""
fi
@@ -416,7 +416,7 @@
dnl configured with --enable-gpl --enable-swscale.
AC_MSG_CHECKING([for libswscale library])
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
- $PKG_CONFIG --exists libswscale && libsws=`$PKG_CONFIG --libs
libswscale`
+ $PKG_CONFIG --exists libswscale && libsws=`$PKG_CONFIG --libs-only-l
libswscale`
else
libsws=""
fi
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- macros/gnashpkgtool.m4 1 Jul 2007 10:54:12 -0000 1.42
+++ macros/gnashpkgtool.m4 11 Sep 2007 00:17:44 -0000 1.43
@@ -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: gnashpkgtool.m4,v 1.42 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: gnashpkgtool.m4,v 1.43 2007/09/11 00:17:44 rsavoye Exp $
dnl Generic macros for finding and setting include-paths and library-path
dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -178,10 +178,10 @@
dnl If the header doesn't exist, there is no point looking for the
library.
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
- $PKG_CONFIG --exists libDOWN[] &&
ac_cv_path_$1_lib=`$PKG_CONFIG --libs libDOWN[]`
- $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG
--libs DOWN[]`
- $PKG_CONFIG --exists lib$name &&
ac_cv_path_$1_lib=`$PKG_CONFIG --libs lib$name`
- $PKG_CONFIG --exists $name && ac_cv_path_$1_lib=`$PKG_CONFIG
--libs $name`
+ $PKG_CONFIG --exists libDOWN[] &&
ac_cv_path_$1_lib=`$PKG_CONFIG --libs-only-l libDOWN[]`
+ $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG
--libs-only-l DOWN[]`
+ $PKG_CONFIG --exists lib$name &&
ac_cv_path_$1_lib=`$PKG_CONFIG --libs-only-l lib$name`
+ $PKG_CONFIG --exists $name && ac_cv_path_$1_lib=`$PKG_CONFIG
--libs-only-l $name`
AC_MSG_CHECKING([for lib$1 library])
AC_MSG_RESULT(${ac_cv_path_$1_lib})
fi
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- macros/gtk2.m4 3 Aug 2007 19:58:12 -0000 1.42
+++ macros/gtk2.m4 11 Sep 2007 00:17:44 -0000 1.43
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: gtk2.m4,v 1.42 2007/08/03 19:58:12 strk Exp $
+dnl $Id: gtk2.m4,v 1.43 2007/09/11 00:17:44 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -89,7 +89,7 @@
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
- $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG --libs
gtk+-2.0`
+ $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG
--libs-only-l gtk+-2.0`
fi
fi
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- macros/gtkglext.m4 1 Jul 2007 10:54:12 -0000 1.35
+++ macros/gtkglext.m4 11 Sep 2007 00:17:44 -0000 1.36
@@ -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: gtkglext.m4,v 1.35 2007/07/01 10:54:12 bjacques Exp $
+dnl: $Id: gtkglext.m4,v 1.36 2007/09/11 00:17:44 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -108,7 +108,7 @@
])
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_lib}" = x; then
- $PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_lib=`$PKG_CONFIG
--libs gtkglext-1.0`
+ $PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_lib=`$PKG_CONFIG
--libs-only-l gtkglext-1.0`
fi
ac_cv_path_glext_incl_config=""
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- macros/kde.m4 10 Sep 2007 14:34:10 -0000 1.38
+++ macros/kde.m4 11 Sep 2007 00:17:44 -0000 1.39
@@ -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.38 2007/09/10 14:34:10 rsavoye Exp $
+dnl $Id: kde.m4,v 1.39 2007/09/11 00:17:44 rsavoye 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}/libkdeui.${shlibext}; then
+ if test `ls -C1 ${with_kde_lib}/libkdeui.* | wc -l` -gt 0; 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.])
@@ -114,7 +114,7 @@
dnl Look for the kdecore library, which is required
if test x"${ac_cv_path_kde_lib}" != x; then
AC_MSG_CHECKING([for kdecore library])
- if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.${shlibext};
then
+ if test `ls -C1 ${topdir}/libkdecore.* | wc -l` -gt 0; then
ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdecore"
AC_MSG_RESULT(${topdir}/libkdecore)
else
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/pango.m4 1 Jul 2007 10:54:13 -0000 1.25
+++ macros/pango.m4 11 Sep 2007 00:17:44 -0000 1.26
@@ -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: pango.m4,v 1.25 2007/07/01 10:54:13 bjacques Exp $
+dnl $Id: pango.m4,v 1.26 2007/09/11 00:17:44 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
@@ -90,7 +90,7 @@
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
- $PKG_CONFIG --exists pangox && ac_cv_path_pango_lib=`$PKG_CONFIG --libs
pangox`
+ $PKG_CONFIG --exists pangox && ac_cv_path_pango_lib=`$PKG_CONFIG
--libs-only-l pangox`
fi
fi
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog macros/boost.m4 macros/curl.m4 ...,
Rob Savoye <=