[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/dmalloc...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac macros/dmalloc... |
|
Date: |
Mon, 20 Feb 2006 17:05:34 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/02/20 17:05:34
Modified files:
. : ChangeLog configure.ac
macros : dmalloc.m4 jpeg.m4 libXML.m4 libtool.m4 mad.m4
ogg.m4 opengl.m4 png.m4 pthreads.m4 sdl.m4
zlib.m4
Log message:
* macros/zlib.m4,sdl.m4,pthreads.m4,png.m4,opengl.m4,
ogg.m4,mad.m4,libtool.m4,libXML.m4,jpeg.m4,dmalloc.m4:
Look for /lib64 and /usr/lib64, and use those for search paths if
they exist.
* configure.ac: Blindly add -L/usr/lib64, so the autoconf library
checking functions get the right path.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.149&tr2=1.150&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/dmalloc.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/jpeg.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libtool.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/mad.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ogg.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/opengl.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/png.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pthreads.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/zlib.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.149 gnash/ChangeLog:1.150
--- gnash/ChangeLog:1.149 Fri Feb 17 16:13:32 2006
+++ gnash/ChangeLog Mon Feb 20 17:05:34 2006
@@ -1,3 +1,12 @@
+2006-02-20 Rob Savoye <address@hidden>
+
+ * macros/zlib.m4,sdl.m4,pthreads.m4,png.m4,opengl.m4,
+ ogg.m4,mad.m4,libtool.m4,libXML.m4,jpeg.m4,dmalloc.m4:
+ Look for /lib64 and /usr/lib64, and use those for search paths if
+ they exist.
+ * configure.ac: Blindly add -L/usr/lib64, so the autoconf library
+ checking functions get the right path.
+
2006-02-17 Rob Savoye <address@hidden>
* server/shm.cpp (closeMem): Use shmctl(), not shm_unlink to
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.38 gnash/configure.ac:1.39
--- gnash/configure.ac:1.38 Tue Feb 14 16:41:02 2006
+++ gnash/configure.ac Mon Feb 20 17:05:34 2006
@@ -139,6 +139,7 @@
AM_COMPILER_LIB
GNASH_PATH_DMALLOC
AC_CHECK_FUNCS(mallinfo)
+LIBS+="-L/usr/lib64"
AC_PATH_FIREFOX
AC_PATH_XTRA
@@ -164,6 +165,7 @@
AM_PATH_OPENGL
GNASH_PATH_PTHREADS
GNASH_PATH_GHELP
+AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
GNASH_DOCBOOK
AM_CONDITIONAL(DOCBOOK, test x$docbook = xyes)
AC_PROG_LIBTOOL
Index: gnash/macros/dmalloc.m4
diff -u gnash/macros/dmalloc.m4:1.3 gnash/macros/dmalloc.m4:1.4
--- gnash/macros/dmalloc.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/dmalloc.m4 Mon Feb 20 17:05:34 2006
@@ -88,7 +88,7 @@
if test x"${ac_cv_path_dmalloc_lib}" = x; then
AC_CHECK_LIB(dmalloc, mallinfo, [ac_cv_path_dmalloc_lib="-ldmalloc"],[
AC_MSG_CHECKING([for libdmalloc library])
- libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib
.. ../.."
+ libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib .. ../.."
for i in $libslist; do
if test -f $i/libdmalloc.a -o -f $i/libdmalloc.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/jpeg.m4
diff -u gnash/macros/jpeg.m4:1.5 gnash/macros/jpeg.m4:1.6
--- gnash/macros/jpeg.m4:1.5 Wed Feb 1 23:58:31 2006
+++ gnash/macros/jpeg.m4 Mon Feb 20 17:05:34 2006
@@ -87,7 +87,7 @@
if test x"${ac_cv_path_jpeg_lib}" = x; then
AC_CHECK_LIB(jpeg, jpeg_mem_init, [ac_cv_path_jpeg_lib="-ljpeg"],[
AC_MSG_CHECKING([for libjpeg library])
- libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib
/usr/pkg/lib .. ../.."
+ libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libjpeg.a -o -f $i/libjpeg.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.10 gnash/macros/libXML.m4:1.11
--- gnash/macros/libXML.m4:1.10 Wed Feb 1 23:58:31 2006
+++ gnash/macros/libXML.m4 Mon Feb 20 17:05:34 2006
@@ -60,7 +60,7 @@
dnl Try finding out yourself
dnl
if test "x$LIBXML_CFLAGS" = "x" -o "x$LIBXML_LIBS" = "x"; then
- dirlist="/usr/pkg /usr /usr/local /opt /home/latest"
+ dirlist="/lib64 /usr/lib64 /lib /usr/lib /usr/pkg /usr /usr/local /opt
/home/latest"
for i in $dirlist; do
if test "x$LIBXML_CFLAGS" = "x"; then
for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
Index: gnash/macros/libtool.m4
diff -u gnash/macros/libtool.m4:1.2 gnash/macros/libtool.m4:1.3
--- gnash/macros/libtool.m4:1.2 Wed Feb 1 23:58:31 2006
+++ gnash/macros/libtool.m4 Mon Feb 20 17:05:34 2006
@@ -1108,7 +1108,7 @@
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e
"s/$PATH_SEPARATOR/ /g"`
fi
else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/local/lib"
fi
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -1191,7 +1191,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib
/usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib64 /usr/lib /usr/local/lib"
# the default ld.so.conf also contains /usr/contrib/lib and
# /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
# libtool to hard-code these into programs
@@ -1267,11 +1267,11 @@
shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n"
"$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep
"^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR,
,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n"
"$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep
"^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR,
,g" -e "s,.*,& /lib64 /usr/lib64 /lib /usr/lib /usr/local/lib,g"`
else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ sys_lib_search_path_spec='/lib64 /usr/lib64 /lib /usr/lib /usr/local/lib'
fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ sys_lib_dlsearch_path_spec='/lib64 /usr/lib64 /usr/local/lib /lib /usr/lib'
;;
dgux*)
@@ -1445,7 +1445,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g'
/etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
Index: gnash/macros/mad.m4
diff -u gnash/macros/mad.m4:1.5 gnash/macros/mad.m4:1.6
--- gnash/macros/mad.m4:1.5 Wed Feb 1 23:58:31 2006
+++ gnash/macros/mad.m4 Mon Feb 20 17:05:34 2006
@@ -88,7 +88,7 @@
if test x"${ac_cv_path_mad_lib}" = x; then
AC_CHECK_LIB(mad, mad_copyright, [ac_cv_path_mad_lib="-lmad"],[
AC_MSG_CHECKING([for libmad library])
- libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib
/usr/pkg/lib .. ../.."
+ libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libmad.a -o -f $i/libmad.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/ogg.m4
diff -u gnash/macros/ogg.m4:1.4 gnash/macros/ogg.m4:1.5
--- gnash/macros/ogg.m4:1.4 Wed Feb 1 23:58:31 2006
+++ gnash/macros/ogg.m4 Mon Feb 20 17:05:34 2006
@@ -88,7 +88,7 @@
if test x"${ac_cv_path_ogg_lib}" = x; then
AC_CHECK_LIB(ogg, ogg_sync_init, [ac_cv_path_ogg_lib="-logg"],[
AC_MSG_CHECKING([for libogg library])
- libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib
/usr/pkg/lib .. ../.."
+ libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libogg.a -o -f $i/libogg.so; then
if test x"$i" != x"/usr/lib"; then
@@ -121,7 +121,7 @@
fi
if test x"${ac_cv_path_ogg_lib}" != x ; then
- OGG_LIBS="${ac_cv_path_ogg_lib} -logg"
+ OGG_LIBS="${ac_cv_path_ogg_lib}"
fi
AM_CONDITIONAL(OGG, [test x$ogg = xyes])
Index: gnash/macros/opengl.m4
diff -u gnash/macros/opengl.m4:1.8 gnash/macros/opengl.m4:1.9
--- gnash/macros/opengl.m4:1.8 Fri Feb 3 20:50:27 2006
+++ gnash/macros/opengl.m4 Mon Feb 20 17:05:34 2006
@@ -88,7 +88,7 @@
if test x"${ac_cv_path_opengl_libraries}" = x; then
AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_libraries="-lGL -lGLU"],[
AC_MSG_CHECKING([for libGL library])
- libslist="/usr/X11R6/lib /usr/lib /usr/local/lib /opt/lib /usr/pkg/lib
.. ../.."
+ libslist="/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib
/usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libGL.a -o -f $i/libGL.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/png.m4
diff -u gnash/macros/png.m4:1.7 gnash/macros/png.m4:1.8
--- gnash/macros/png.m4:1.7 Thu Feb 2 16:39:05 2006
+++ gnash/macros/png.m4 Mon Feb 20 17:05:34 2006
@@ -93,7 +93,7 @@
if test x"${ac_cv_path_png_lib}" = x; then
AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib="-lpng"],[
AC_MSG_CHECKING([for libpng library])
- libslist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib
/usr/pkg/lib /usr/X11R6/lib .. ../.."
+ libslist=" /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/pkg/lib /usr/X11R6/lib .. ../.."
for i in $libslist; do
if test -f $i/libpng.a -o -f $i/libpng.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/pthreads.m4
diff -u gnash/macros/pthreads.m4:1.3 gnash/macros/pthreads.m4:1.4
--- gnash/macros/pthreads.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/pthreads.m4 Mon Feb 20 17:05:34 2006
@@ -106,7 +106,7 @@
else
AC_CHECK_LIB(pthread, pthread_kill,
[ac_cv_path_pthread_lib="-lpthreads"],[
AC_MSG_CHECKING([for libpthreads library])
- libslist="/usr/pkg/pthreads/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib /usr/lib /usr/pkg/lib .. ../.."
+ libslist="/usr/lib64 /usr/lib /usr/pkg/pthreads/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libpthreads.a -o -f $i/libpthreads.so; then
if test x"$i" != x"/usr/lib"; then
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.7 gnash/macros/sdl.m4:1.8
--- gnash/macros/sdl.m4:1.7 Sat Feb 11 15:18:22 2006
+++ gnash/macros/sdl.m4 Mon Feb 20 17:05:34 2006
@@ -240,12 +240,19 @@
])
if test x"${ac_cv_path_sdl_mixer_lib}" = x ; then
- liblist="/usr/pkg/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/lib .. ../.."
+ liblist=" /usr/lib64 /usr/lib /usr/pkg/lib /sw/lib /usr/local/lib
/home/latest/lib /opt/lib.. ../.."
for i in $liblist; do
if test -f $i/libSDL_mixer.a -o -f $i/libSDL_mixer.so -o -f
$i/libSDL_mixer.dylib; then
ac_cv_path_sdl_mixer_lib=$i
break
+ else
+dnl Some systems ubnfortunately use the version on this library, and don't
+dnl have a symbolic link without a version number,
+ if test -f $i/libSDL_mixer-1.2.a -o -f $i/libSDL_mixer-1.2.so -o -f
$i/libSDL_mixer.dylib; then
+ ac_cv_path_sdl_mixer_lib=$i
+ break
+ fi
fi
done
Index: gnash/macros/zlib.m4
diff -u gnash/macros/zlib.m4:1.3 gnash/macros/zlib.m4:1.4
--- gnash/macros/zlib.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/zlib.m4 Mon Feb 20 17:05:34 2006
@@ -76,7 +76,7 @@
])
if test x"${ac_cv_path_zlib_lib}" = x ; then
- liblist="/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/lib ..
../.."
+ liblist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib .. ../.."
for i in $liblist; do
if test -f $i/libz.a -o -f $i/libz.so -o -f $i/libz.dylib; then