[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac macros/gnashpkgtool.m4 macro...
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash configure.ac macros/gnashpkgtool.m4 macro... |
Date: |
Sun, 26 Nov 2006 11:16:55 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/11/26 11:16:55
Modified files:
. : configure.ac
macros : gnashpkgtool.m4
Removed files:
macros : atk.m4
Log message:
Got rid of this too...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.215&r2=1.216
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.25&r2=0
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -b -r1.215 -r1.216
--- configure.ac 26 Nov 2006 10:31:30 -0000 1.215
+++ configure.ac 26 Nov 2006 11:16:55 -0000 1.216
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.215 2006/11/26 10:31:30 nihilus Exp $
+dnl $Id: configure.ac,v 1.216 2006/11/26 11:16:55 nihilus Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -548,7 +548,7 @@
fi
GNASH_PATH_GTK2
GNASH_PATH_PANGO
- GNASH_PATH_ATK
+ GNASH_PKG_FIND(atk, [atk.h], [atk library], atk_focus_tracker_init,
[1.0])
if test x"$fltk" = x"yes"; then
GNASH_PKG_FIND(Xft, [Xft.h], [xft library], XftGlyphRender)
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/gnashpkgtool.m4 26 Nov 2006 10:31:30 -0000 1.30
+++ macros/gnashpkgtool.m4 26 Nov 2006 11:16:55 -0000 1.31
@@ -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.30 2006/11/26 10:31:30 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.31 2006/11/26 11:16:55 nihilus Exp $
dnl Generic macros for finding and setting include-paths and library-path
dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -65,7 +65,7 @@
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_$1_incl}" = x; then
- AC_CHECK_HEADERS($1/$2 $2 $name/$2,
[ac_cv_path_$1_incl="-I$1"],[
+ AC_CHECK_HEADERS($1/$2 $2 $name/$2,
[ac_cv_path_$1_incl="-I/usr/include/$name"],[
if test x"${ac_cv_path_$1_incl}" = x; then
incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/nekoware/include /usr/freeware/include /pkg/include
/opt/local/include /usr/local/include /home/latest/include /opt/include
/opt/mesa/include /opt/include /usr/X11R6/include /usr/include /usr/pkg/include
.. ../.."
for i in $incllist; do
Index: macros/atk.m4
===================================================================
RCS file: macros/atk.m4
diff -N macros/atk.m4
--- macros/atk.m4 9 Nov 2006 18:28:15 -0000 1.25
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl You should have received a copy of the GNU General Public License
-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
-dnl
-
-dnl $Id: atk.m4,v 1.25 2006/11/09 18:28:15 nihilus Exp $
-
-AC_DEFUN([GNASH_PATH_ATK],
-[
-
- dnl Look for the header
- AC_ARG_WITH(atk_incl, AC_HELP_STRING([--with-atk-incl], [directory where
libatk header is]), with_atk_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_atk_incl,[
- if test x"${with_atk_incl}" != x ; then
- if test -f ${with_atk_incl}/atk/atk.h ; then
- ac_cv_path_atk_incl=-I`(cd ${with_atk_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_atk_incl} directory doesn't contain
atk/atk.h])
- fi
-fi
-])
-
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_incl}" = x; then
- $PKG_CONFIG --exists atk && ac_cv_path_atk_incl=`$PKG_CONFIG --cflags
atk`
-fi
-
- dnl Attempt to find the top level directory, which unfortunately has a
- 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"$PKG_CONFIG" != x; then
- $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion
atk | cut -d "." -f 1 | awk '{print $'0'".0"}'`
-fi
-
-if test x"${gnash_atk_version}" = x; then
-
- pathlist="${prefix}/${target_alias}/include ${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=""
- for i in $pathlist; do
- for j in `ls -dr $i/atk-[[0-9]].[[0-9]] 2>/dev/null`; do
- if test -f $j/atk/atk.h; then
- gnash_atk_topdir=`basename $j`
- gnash_atk_version=`echo ${gnash_atk_topdir} | sed -e
's:atk-::'`
- break
- fi
- done
- if test x$gnash_atk_version != x; then
- break;
- fi
- done
-fi
-
-if test x"${gnash_atk_version}" = x; then
- AC_MSG_RESULT(none)
-else
- AC_MSG_RESULT(${gnash_atk_version})
-fi
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_atk_incl}" = x; then #{
-
- AC_CHECK_HEADERS(atk/atk.h, [ac_cv_path_atk_incl=""],[
-
- if test x"${ac_cv_path_atk_incl}" = x; then #{
-
- incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /usr/local/include /opt/local/include /home/latest/include
/usr/X11R6/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
- for i in $incllist; do #{
- if test -f $i/atk/atk.h; then #{
- ac_cv_path_atk_incl="-I$i"
- break
- else # }{
- if test -f $i/${gnash_atk_topdir}/atk/atk.h; then #{
- ac_cv_path_atk_incl="-I$i/${gnash_atk_topdir}"
- break
- fi #}
- fi #}
- done #}
- fi #}
-
- ])
-
- fi #}
-
-AC_MSG_CHECKING([for libatk header])
-AC_MSG_RESULT(${ac_cv_path_atk_incl})
-
- dnl Look for the library
- AC_ARG_WITH(atk_lib, AC_HELP_STRING([--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
- 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
- fi
- ])
-
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_atk_lib}" = x; then
- $PKG_CONFIG --exists atk && ac_cv_path_atk_lib=`$PKG_CONFIG --libs atk`
-fi
-
- dnl If the header doesn't exist, there is no point looking for
- dnl the library.
-
- if test x"${ac_cv_path_atk_incl}" != x -a x"${ac_cv_path_atk_lib}" = x ;
then #{
- AC_CHECK_LIB(atk-${gnash_atk_version}, atk_focus_tracker_init,
[ac_cv_path_atk_lib="-latk-${gnash_atk_version}"],[
- libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/lib64 /usr/lib /opt/local/lib /sw/lib /usr/local/lib /home/latest/lib
/opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
- for i in $libslist; do
- if test -f $i/libatk-${gnash_atk_version}.a -o -f
$i/libatk-${gnash_atk_version}.so; then #{
- if test x"$i" != x"/usr/lib"; then #{
- ac_cv_path_atk_lib="-L$i -latk-${gnash_atk_version}"
- else #}{
- ac_cv_path_atk_lib="-latk-${gnash_atk_version}"
- fi #}
- break
- fi #}
- done])
- fi #}
-
-AC_MSG_CHECKING([for libatk library])
-AC_MSG_RESULT(${ac_cv_path_atk_lib})
-
-if test x"${ac_cv_path_atk_incl}" != x ; then
- ATK_CFLAGS="${ac_cv_path_atk_incl}"
-else
- ATK_CFLAGS=""
-fi
-
-if test x"${ac_cv_path_atk_lib}" != x ; then
- ATK_LIBS="${ac_cv_path_atk_lib}"
-else
- ATK_LIBS=""
-fi
-
-AC_SUBST(ATK_CFLAGS)
-AC_SUBST(ATK_LIBS)
-])