[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/atk.m4
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog macros/atk.m4 |
Date: |
Thu, 12 Oct 2006 15:44:11 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/10/12 15:44:10
Modified files:
. : ChangeLog
macros : atk.m4
Log message:
* macros/atk.m4: added missing switches in lib detection;
always look for atk version and topdir as those might
eventually
be needed by subsequent library seeking.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1167&r2=1.1168
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.17&r2=1.18
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1167
retrieving revision 1.1168
diff -u -b -r1.1167 -r1.1168
--- ChangeLog 12 Oct 2006 14:43:29 -0000 1.1167
+++ ChangeLog 12 Oct 2006 15:44:10 -0000 1.1168
@@ -1,5 +1,8 @@
2006-10-12 Sandro Santilli <address@hidden>
+ * macros/atk.m4: added missing switches in lib detection;
+ always look for atk version and topdir as those might eventually
+ be needed by subsequent library seeking.
* server/gnash.h: document enclose_transformed_rect() function.
2006-10-12 Markus Gothe <address@hidden>
Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/atk.m4 10 Oct 2006 22:23:15 -0000 1.17
+++ macros/atk.m4 12 Oct 2006 15:44:10 -0000 1.18
@@ -35,7 +35,7 @@
dnl
dnl
-dnl $Id: atk.m4,v 1.17 2006/10/10 22:23:15 nihilus Exp $
+dnl $Id: atk.m4,v 1.18 2006/10/12 15:44:10 strk Exp $
AC_DEFUN([GNASH_PATH_ATK],
[
@@ -59,7 +59,11 @@
dnl version number attached. At least on Debain based systems, this
dnl doesn't seem to get a directory that is unversioned.
AC_MSG_CHECKING([for the Atk Version])
- if test x"${ac_cv_path_atk_incl}" = x; then
+
+ if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $1".0"}'`
+ fi
+
pathlist="${prefix}/include /sw/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/local/include
/opt/local/include /usr/include /usr/pkg/include .. ../.."
gnash_atk_topdir=""
gnash_atk_version=""
@@ -72,15 +76,11 @@
fi
done
done
- fi
if test x"${gnash_atk_version}" = x; then
AC_MSG_RESULT(none)
else
AC_MSG_RESULT(${gnash_atk_version})
- if test x"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $1".0"}'`
- fi
fi
dnl If the path hasn't been specified, go look for it.
@@ -114,8 +114,9 @@
AC_ARG_WITH(atk_lib, [ --with-atk-lib directory where atk library
is], with_atk_lib=${withval})
AC_CACHE_VAL(ac_cv_path_atk_lib,[
if test x"${with_atk_lib}" != x ; then
- if test -f ${with_atk_lib}/libatkatk-x11-${gnash_atk_version}.a -o -f
${with_atk_lib}/libatkatk-x11-${gnash_atk_version}.so; then
- ac_cv_path_atk_lib=`(cd ${with_atk_lib}; pwd)`
+ libname=atkatk-x11-${gnash_atk_version}
+ if test -f ${with_atk_lib}/lib${libname}.a -o -f
${with_atk_lib}/lib${libname}.so; then
+ ac_cv_path_atk_lib=`-L(cd ${with_atk_lib}; pwd)` -l${libname}
else
AC_MSG_ERROR([${with_atk_lib} directory doesn't contain libatkatk.])
fi
@@ -138,12 +139,12 @@
ac_cv_path_atk_lib="-L$i -latk-${gnash_atk_version}"
break
else
- ac_cv_path_atk_lib=""
+ ac_cv_path_atk_lib="-latk-${gnash_atk_version}"
break
fi
else
if test -f $i/libatk-${gnash_atk_version}.a -o -f
$i/libatk-${gnash_atk_version}.so; then
- ac_cv_path_atk_lib="$i/${gnash_atk_topdir}"
+ ac_cv_path_atk_lib="-L$i/${gnash_atk_topdir}
-latk-${gnash_atk_version}"
fi
break
fi
@@ -151,9 +152,9 @@
else
if test -f $i/libatk-${gnash_atk_version}.a -o -f
$i/libatk-${gnash_atk_version}.so; then
if test x"${ac_cv_path_atk_lib}" != x"/usr/lib"; then
- ac_cv_path_atk_lib="-L${ac_cv_path_atk_lib}"
+ ac_cv_path_atk_lib="-L${ac_cv_path_atk_lib} -latk-${gnash_atk_version}"
else
- ac_cv_path_atk_lib=""
+ ac_cv_path_atk_lib="-latk-${gnash_atk_version}"
fi
fi
fi
- [Gnash-commit] gnash ChangeLog macros/atk.m4,
Sandro Santilli <=