CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/10/13 23:24:08
Modified files:
. : ChangeLog
macros : agg.m4 boost.m4 curl.m4 ffmpeg.m4 freetype.m4
glib.m4 gnashpkgtool.m4 gtk2.m4 gtkglext.m4
jpeg.m4 kde.m4 libXML.m4 lirc.m4 ming.m4
mysql.m4 opengl.m4 pango.m4 pthreads.m4 sdl.m4
x11.m4
Log message:
* macros/agg.m4, curl.m4, ffmpeg.m4, freetype.m4, glib.m4,
gnashpkgtool.m4, gtk2.m4, gtkglext.m4, jpeg.m4, kde.m4,
libXML.m4,
lirc.m4, ming.m4, mysql.m4, opengl.m4, pango.m4, pthreads.m4,
sdl.m4, x11.m4: Also test for /usr/lib64, so it doesn't sneak
into
our LDFLAGS. This will cause make distcheck to fail on a 64 bit
machine.CVS:
----------------------------------------------------------------------
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4601&r2=1.4602
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/freetype.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lirc.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4601
retrieving revision 1.4602
diff -u -b -r1.4601 -r1.4602
--- ChangeLog 13 Oct 2007 14:42:41 -0000 1.4601
+++ ChangeLog 13 Oct 2007 23:24:06 -0000 1.4602
@@ -1,3 +1,11 @@
+2007-10-13 Rob Savoye <[EMAIL PROTECTED]>
+
+ * macros/agg.m4, curl.m4, ffmpeg.m4, freetype.m4, glib.m4,
+ gnashpkgtool.m4, gtk2.m4, gtkglext.m4, jpeg.m4, kde.m4, libXML.m4,
+ lirc.m4, ming.m4, mysql.m4, opengl.m4, pango.m4, pthreads.m4,
+ sdl.m4, x11.m4: Also test for /usr/lib64, so it doesn't sneak into
+ our LDFLAGS. This will cause make distcheck to fail on a 64 bit machine.
+
2007-10-13 Udo Giacomozzi <[EMAIL PROTECTED]>
* gui/fbsup.h: Make PS/2 mouse the default (instead of ETurboTouch)
@@ -104,9 +112,9 @@
2007-10-09 Zou Lunkai <[EMAIL PROTECTED]>
- * testsuite/misc-ming.all/PlaceObject2Test.swf, Makefile.am: enable an
old
- testcase, it wasn't used actually. Test DLIST tags with dynamic depth
manipulation.
- All passed with cvs-head.
+ * testsuite/misc-ming.all/PlaceObject2Test.swf, Makefile.am:
+ enable an old testcase, it wasn't used actually. Test DLIST tags
+ with dynamic depth manipulation. All passed with cvs-head.
2007-10-09 Sandro Santilli <[EMAIL PROTECTED]>
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/agg.m4 1 Jul 2007 10:54:11 -0000 1.29
+++ macros/agg.m4 13 Oct 2007 23:24:07 -0000 1.30
@@ -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: agg.m4,v 1.29 2007/07/01 10:54:11 bjacques Exp $
+dnl $Id: agg.m4,v 1.30 2007/10/13 23:24:07 rsavoye Exp $
dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
dnl but not in AGG 2.3. As we need AGG 2.4, we use this as
@@ -96,7 +96,7 @@
if test x"${ac_cv_path_agg_lib}" = x; then
for i in $libslist; do
if test -f $i/libagg.a -o -f $i/libagg.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_agg_lib="-L$i"
break
else
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- macros/boost.m4 6 Oct 2007 00:49:52 -0000 1.64
+++ macros/boost.m4 13 Oct 2007 23:24:07 -0000 1.65
@@ -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.64 2007/10/06 00:49:52 rsavoye Exp $
+dnl $Id: boost.m4,v 1.65 2007/10/13 23:24:07 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -153,9 +153,9 @@
AC_SUBST(BOOST_CFLAGS)
AC_SUBST(BOOST_LIBS)
- # This isn't right: you don't need boot date-time installed unless u build
- # cygnal, and it is sometimes a separate package from Boost core and thread.
- # TODO: why is this needed, lack of boost being a fatal error?
+ dnl This isn't right: you don't need boot date-time installed unless u build
+ dnl cygnal, and it is sometimes a separate package from Boost core and
thread.
+ dnl TODO: why is this needed, lack of boost being a fatal error?
AM_CONDITIONAL(HAVE_BOOST, [test -n "${BOOST_LIBS}"])
])
Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- macros/curl.m4 11 Sep 2007 00:17:43 -0000 1.18
+++ macros/curl.m4 13 Oct 2007 23:24:07 -0000 1.19
@@ -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.18 2007/09/11 00:17:43 rsavoye Exp $
+dnl $Id: curl.m4,v 1.19 2007/10/13 23:24:07 rsavoye Exp $
AC_DEFUN([GNASH_PATH_CURL],
[
@@ -99,7 +99,7 @@
AC_MSG_CHECKING([for libcurl library])
for i in $libslist; do # {
if test -f $i/libcurl.a -o -f $i/libcurl.${shlibext}; then # {
- if test x"$i" != x"/usr/lib"; then # {
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then # {
ac_cv_path_curl_lib="-L$i -lcurl"
AC_MSG_RESULT(${ac_cv_path_curl_lib})
break
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- macros/ffmpeg.m4 11 Sep 2007 00:17:44 -0000 1.51
+++ macros/ffmpeg.m4 13 Oct 2007 23:24:07 -0000 1.52
@@ -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.51 2007/09/11 00:17:44 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.52 2007/10/13 23:24:07 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -234,7 +234,7 @@
if test -f $i/libavcodec.a -o -f $i/libavcodec.${shlibext}; then
topdir=$i
AC_MSG_RESULT(${topdir}/libavcodec)
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -L$i -lavcodec"
break
else
Index: macros/freetype.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/freetype.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/freetype.m4 14 Sep 2007 06:46:27 -0000 1.2
+++ macros/freetype.m4 13 Oct 2007 23:24:07 -0000 1.3
@@ -83,7 +83,7 @@
dnl Look for the library
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_freetype_lib}" = x; then
- $PKG_CONFIG --exists freetype2 && ac_cv_path_freetype_lib=`$PKG_CONFIG
--libs freetype2`
+ $PKG_CONFIG --exists freetype2 && ac_cv_path_freetype_lib=`$PKG_CONFIG
--libs-only-l freetype2`
fi
fi
@@ -95,7 +95,7 @@
AC_MSG_CHECKING([for ${libname} library])
for i in $libslist; do
if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_freetype_lib="-L$i -l${libname}"
AC_MSG_RESULT(${ac_cv_path_freetype_lib})
break
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/glib.m4 1 Jul 2007 10:54:12 -0000 1.27
+++ macros/glib.m4 13 Oct 2007 23:24:07 -0000 1.28
@@ -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: glib.m4,v 1.27 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: glib.m4,v 1.28 2007/10/13 23:24:07 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLIB],
[
@@ -89,7 +89,7 @@
if test x"${ac_cv_path_glib_lib}" = x; then
for i in $libslist; do
if test -f $i/libglib-${gnash_glib_version}.a -o -f
$i/libglib-${gnash_glib_version}.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_glib_lib="-L$i -lglib-${gnash_glib_version}"
break
else
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- macros/gnashpkgtool.m4 11 Sep 2007 00:17:44 -0000 1.43
+++ macros/gnashpkgtool.m4 13 Oct 2007 23:24:07 -0000 1.44
@@ -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.43 2007/09/11 00:17:44 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.44 2007/10/13 23:24:07 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().
@@ -193,7 +193,7 @@
for i in $libslist; do
if test -f $i/lib$1.a -o -f $i/lib$1.${shlibext}; then
if test -f "$i/lib$1.a" -o -f
"$i/lib$1.${shlibext}"; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a !
x"$i" = x"/usr/lib64"; then
ac_cv_path_$1_lib="-L$i -l$1 $5"
break
else
@@ -203,7 +203,7 @@
fi
else
if test -f "$i/lib$name.a" -o -f
"$i/lib$name.${shlibext}"; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a !
x"$i" = x"/usr/lib64"; then
ac_cv_path_$1_lib="-L$i -l$name
$5"
break
else
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- macros/gtk2.m4 11 Sep 2007 00:17:44 -0000 1.43
+++ macros/gtk2.m4 13 Oct 2007 23:24:07 -0000 1.44
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: gtk2.m4,v 1.43 2007/09/11 00:17:44 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.44 2007/10/13 23:24:07 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -99,7 +99,7 @@
if test x"${ac_cv_path_gtk2_incl}" != x -a x"${ac_cv_path_gtk2_lib}" = x;
then
for i in $libslist; do
if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_gtk2_lib="-L$i -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0
-lgmodule-2.0"
break
else
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- macros/gtkglext.m4 11 Sep 2007 00:17:44 -0000 1.36
+++ macros/gtkglext.m4 13 Oct 2007 23:24:07 -0000 1.37
@@ -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.36 2007/09/11 00:17:44 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.37 2007/10/13 23:24:07 rsavoye Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -117,7 +117,7 @@
for i in $libslist; do
if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f
$i/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
ac_cv_path_glext_incl_config="-I$i/gtkglext-${gnash_glext_version}/include"
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" =
x"/usr/lib64"; then
ac_cv_path_glext_lib="-L$i
-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
break
fi
Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/jpeg.m4 1 Jul 2007 10:54:12 -0000 1.24
+++ macros/jpeg.m4 13 Oct 2007 23:24:07 -0000 1.25
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: jpeg.m4,v 1.24 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: jpeg.m4,v 1.25 2007/10/13 23:24:07 rsavoye Exp $
AC_DEFUN([GNASH_PATH_JPEG],
[
@@ -85,7 +85,7 @@
AC_MSG_CHECKING([for libjpeg library])
for i in $libslist; do
if test -f $i/libjpeg.a -o -f $i/libjpeg.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_jpeg_lib="-L$i"
break
else
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- macros/kde.m4 11 Sep 2007 04:17:17 -0000 1.40
+++ macros/kde.m4 13 Oct 2007 23:24:08 -0000 1.41
@@ -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.40 2007/09/11 04:17:17 rsavoye Exp $
+dnl $Id: kde.m4,v 1.41 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_KDE],
[
@@ -100,7 +100,7 @@
if test -f $i/libkdeui.a -o -f $i/libkdeui.${shlibext} ; then
topdir=$i
AC_MSG_RESULT(${topdir}/libkdeui)
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_kde_lib="-L$i -lkdeui"
break
else
Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- macros/libXML.m4 1 Jul 2007 10:54:12 -0000 1.31
+++ macros/libXML.m4 13 Oct 2007 23:24:08 -0000 1.32
@@ -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: libXML.m4,v 1.31 2007/07/01 10:54:12 bjacques Exp $
+dnl $Id: libXML.m4,v 1.32 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_LIBXML], [
has_xml=no
@@ -79,7 +79,7 @@
if test x"${ac_cv_path_libxml_lib}" = x ; then
for i in $libslist; do
if test -f $i/libxml2.a -o -f $i/libxml2.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_libxml_lib="-L$i -lxml2"
break
else
Index: macros/lirc.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/lirc.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/lirc.m4 13 Sep 2007 19:32:49 -0000 1.1
+++ macros/lirc.m4 13 Oct 2007 23:24:08 -0000 1.2
@@ -39,14 +39,7 @@
fi
])
- AC_ARG_ENABLE(lirc, AC_HELP_STRING([--enable-lirc], [Enable support for
Lirc]),
- [case "${enableval}" in
- yes) lirc=yes ;;
- no) lirc=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-lirc option]) ;;
- esac], lirc=no)
-
- if test x"${lirc}" = x"yes"; then
+ if test x"${ext_lirc}" = x"yes"; then
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_lirc_incl}" = x; then
for i in $incllist; do
@@ -76,7 +69,7 @@
AC_MSG_CHECKING([for lirc_client library])
for i in $libslist; do
if test -f $i/liblirc_client.a -o -f $i/liblirc_client.${shlibext};
then
- if test x"$i" != x"/usr/lib"; then
+ if test x"$i" != x"/usr/lib" -o x"$i" != x"/usr/lib64"; then
ac_cv_path_lirc_lib="-L$i -llirc_client"
AC_MSG_RESULT(${ac_cv_path_lirc_lib})
break
@@ -98,8 +91,9 @@
fi
if test x"${ac_cv_path_lirc_lib}" != x ; then
- if test x"${ac_cv_path_lirc_lib}" != x"/usr/lib"; then
+ if test ! x"${ac_cv_path_lirc_lib}" = x"/usr/lib" -a ! x"$i" =
x"/usr/lib64"; then
LIRC_LIBS="${ac_cv_path_lirc_lib}"
+ AC_DEFINE(HAVE_LIRC, [1], [Has Lirc])
fi
else
LIRC_LIBS=""
Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/ming.m4 1 Jul 2007 10:54:13 -0000 1.16
+++ macros/ming.m4 13 Oct 2007 23:24:08 -0000 1.17
@@ -111,7 +111,7 @@
if test x"${ac_cv_path_ming_incl}" != x; then
for i in $libslist; do
if test -f $i/libming.a -o -f $i/libming.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_ming_lib="-L$i -lming"
break
else
Index: macros/mysql.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mysql.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/mysql.m4 1 Jul 2007 10:54:13 -0000 1.6
+++ macros/mysql.m4 13 Oct 2007 23:24:08 -0000 1.7
@@ -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: mysql.m4,v 1.6 2007/07/01 10:54:13 bjacques Exp $
+dnl $Id: mysql.m4,v 1.7 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_MYSQL],
[
@@ -86,7 +86,7 @@
for i in $libslist; do
if test -f $i/libmysqlclient.a -o -f
$i/libmysqlclient.${shlibext}; then
topdir=$i
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_mysql_lib="-L$i -lmysqlclient"
break
else
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- macros/opengl.m4 17 Jul 2007 23:07:30 -0000 1.35
+++ macros/opengl.m4 13 Oct 2007 23:24:08 -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: opengl.m4,v 1.35 2007/07/17 23:07:30 nihilus Exp $
+dnl $Id: opengl.m4,v 1.36 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OPENGL],
[
@@ -95,7 +95,7 @@
newlist="/System/Library/Frameworks/OpenGL.framework/Libraries
${libslist}"
for i in $newlist; do
if test -f $i/libGL.${shlibext} -o -f $i/libGL.a; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_opengl_lib="-L$i -lGL"
break
else
Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/pango.m4 11 Sep 2007 00:17:44 -0000 1.26
+++ macros/pango.m4 13 Oct 2007 23:24:08 -0000 1.27
@@ -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.26 2007/09/11 00:17:44 rsavoye Exp $
+dnl $Id: pango.m4,v 1.27 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PANGO],
[
@@ -97,7 +97,7 @@
if test x"${ac_cv_path_pango_lib}" = x; then
for i in $libslist; do
if test -f $i/libpango-${gnash_pango_version}.a -o -f
$i/libpango-${gnash_pango_version}.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_pango_lib="-L$i -lpango-${gnash_pango_version}"
break
else
Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- macros/pthreads.m4 23 Aug 2007 09:26:50 -0000 1.31
+++ macros/pthreads.m4 13 Oct 2007 23:24:08 -0000 1.32
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl Copyright (C) 2006 Steven G. Johnson <[EMAIL PROTECTED]>.
-dnl $Id: pthreads.m4,v 1.31 2007/08/23 09:26:50 strk Exp $
+dnl $Id: pthreads.m4,v 1.32 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PTHREADS],
[
@@ -180,7 +180,7 @@
for i in $libslist; do
if test -f $i/libpthread.a -o -f $i/libpthread.${shlibext} -o -f
$i/libpthread.dylib; then
pthreads=yes
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
PTHREAD_LIBS="-L$i -lpthread"
break
else
Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- macros/sdl.m4 1 Jul 2007 10:54:14 -0000 1.41
+++ macros/sdl.m4 13 Oct 2007 23:24:08 -0000 1.42
@@ -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: sdl.m4,v 1.41 2007/07/01 10:54:14 bjacques Exp $
+dnl $Id: sdl.m4,v 1.42 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_SDL], [
has_sdl=no
@@ -118,7 +118,7 @@
if test x"${ac_cv_path_sdl_lib}" = x ; then
for i in $libslist; do
if test -f $i/libSDL.a -o -f $i/libSDL.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -o x"$i" = x"/usr/lib64"; then
ac_cv_path_sdl_lib="-L$i -lSDL"
dnl AC_MSG_RESULT(${ac_cv_path_sdl_lib})
break
@@ -130,7 +130,7 @@
fi
else
if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.${shlibext}; then
- if test x"$i" != x"/usr/lib"; then
+ if test ! x"$i" = x"/usr/lib" -o x"$i" = x"/usr/lib64"; then
ac_cv_path_sdl_lib="-L$i -lSDL-1.1"
dnl AC_MSG_RESULT(${ac_cv_path_sdl_lib})
break
Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- macros/x11.m4 20 Jul 2007 01:50:32 -0000 1.13
+++ macros/x11.m4 13 Oct 2007 23:24:08 -0000 1.14
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: x11.m4,v 1.13 2007/07/20 01:50:32 rsavoye Exp $
+dnl $Id: x11.m4,v 1.14 2007/10/13 23:24:08 rsavoye Exp $
AC_DEFUN([GNASH_PATH_X11],
[
@@ -71,7 +71,7 @@
newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/lib
/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
for i in $newlist; do
if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
- if test x"${i}" != x"/usr/lib"; then
+ if test ! x"${i}" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
ac_cv_path_x11_lib="-L$i -lX11"
else
ac_cv_path_x11_lib="-lX11"
@@ -95,7 +95,7 @@
for i in $newlist; do
if test -f $i/libXplugin.a -o -f $i/libXplugin.${shlibext}; then
- if test x"${i}" != x"/usr/lib"; then
+ if test ! x"${i}" = x"/usr/lib" -o x"$i" = x"/usr/lib64"; then
ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -L$i -lXplugin"
else
ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXplugin"
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
