[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: |
Sat, 25 Nov 2006 20:58:54 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/11/25 20:58:54
Modified files:
. : configure.ac
macros : gnashpkgtool.m4
Removed files:
macros : gstreamer.m4
Log message:
Getting rid of another macro-file... ;)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.22&r2=0
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- configure.ac 25 Nov 2006 18:50:30 -0000 1.209
+++ configure.ac 25 Nov 2006 20:58:54 -0000 1.210
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.209 2006/11/25 18:50:30 nihilus Exp $
+dnl $Id: configure.ac,v 1.210 2006/11/25 20:58:54 nihilus Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -546,7 +546,11 @@
GNASH_PATH_GTK2
GNASH_PATH_PANGO
GNASH_PATH_ATK
+dnl I'm kinda lazy, get rid of this later... //Markus
+AM_CONDITIONAL(HAVE_XFT, test x$fltk = xyes)
+ if test x"$fltk" = x"yes"; then
GNASH_PKG_FIND(Xft, [Xft.h], [xft library], XftGlyphRender)
+ fi
GNASH_PATH_GHELP
dnl Using GTK always needs Cairo, even with OpenGL
GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
@@ -627,8 +631,10 @@
*)
esac
+dnl I'm kinda lazy, get rid of this later... //Markus
+AM_CONDITIONAL(HAVE_GST, test x$sound_handler = xgst)
if test "$sound_handler" = "gst"; then
- GNASH_PATH_GSTREAMER
+ GNASH_PKG_FIND(gstreamer, [gst.h], [gstreamer library], gst_init,
[0.10])
fi
if test x$gui = xfltk; then
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/gnashpkgtool.m4 25 Nov 2006 19:26:26 -0000 1.19
+++ macros/gnashpkgtool.m4 25 Nov 2006 20:58:54 -0000 1.20
@@ -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.19 2006/11/25 19:26:26 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.20 2006/11/25 20:58:54 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()..
@@ -37,6 +37,12 @@
AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
esac], $1=yes)
+if test x$4 = x; then
+ name=$1
+else
+ name=$1-$4
+fi
+
dnl Look for the header
if test x"${$1}" = x"yes"; then
AC_ARG_WITH($1_incl, AC_HELP_STRING([--with-$1-incl],
[directory where $2 is]), with_$1_incl=${withval})
@@ -51,17 +57,17 @@
])
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
- $PKG_CONFIG --exists $1 && ac_cv_path_$1_incl=`$PKG_CONFIG
--cflags $1`
- $PKG_CONFIG --exists lib$1 && ac_cv_path_$1_lib=`$PKG_CONFIG
--cflags lib$1`
+ $PKG_CONFIG --exists $name && ac_cv_path_$1_incl=`$PKG_CONFIG
--cflags $name`
+ $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib=`$PKG_CONFIG
--cflags lib$name`
fi
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, [ac_cv_path_$1_incl=""],[
+ AC_CHECK_HEADERS($name/$2 $2, [ac_cv_path_$1_incl=""],[
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
/usr/include /usr/pkg/include .. ../.."
for i in $incllist; do
- if test -f $i/$1; then
+ if test -f $i/$name; then
if test x"$i" != x"/usr/include"; then
ac_cv_path_$1_incl="-I$i"
break
@@ -70,8 +76,8 @@
break
fi
else
- if test -f $i/$1/$2; then
- ac_cv_path_$1_incl="-I$i/$1"
+ if test -f $i/$name/$2; then
+ ac_cv_path_$1_incl="-I$i/$name"
break
fi
fi
@@ -108,13 +114,20 @@
*)
AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
esac], $1=yes)
+
+if test x$4 = x; then
+ name=$1
+else
+ name=$1-$4
+fi
+
if test x"${$1}" = x"yes"; then
dnl Look for the library
AC_ARG_WITH($1_lib, AC_HELP_STRING([--with-$1-lib], [directory where $1
library is]), with_$1_lib=${withval})
AC_CACHE_VAL(ac_cv_path_$1_lib,[
if test x"${with_$1_lib}" != x ; then
AC_MSG_CHECKING([for lib$1 library in specified directory])
- if test -f ${with_$1_lib}/lib$1.a -o -f
${with_$1_lib}/lib$1.so; then
+ if test -f ${with_$1_lib}/lib$name.a -o -f
${with_$1_lib}/lib$name.so; then
tmp=`(cd ${with_$1_lib}; pwd)`
ac_cv_path_$1_lib="-L${tmp} -l$1"
AC_MSG_RESULT([yes])
@@ -127,17 +140,17 @@
dnl If the header doesn't exist, there is no point looking for the
library.
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
- $PKG_CONFIG --exists lib$1 && ac_cv_path_$1_lib=`$PKG_CONFIG
--libs lib$1`
- $PKG_CONFIG --exists $1 && ac_cv_path_$1_lib=`$PKG_CONFIG
--libs $1`
+ $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`
fi
if test x"${ac_cv_path_$1_lib}" = x; then
- AC_CHECK_LIB($1, $2, [ac_cv_path_$1_lib="-l$1"],[
+ AC_CHECK_LIB($name, $2, [ac_cv_path_$1_lib="-l$name"],[
libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/nekoware/lib
/usr/freeware/lib /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/pkg/lib /opt/local/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
- if test -f "$i/lib$1.a" -o -f "$i/lib$1.so"; then
+ if test -f "$i/lib$name.a" -o -f "$i/lib$name.so"; then
if test x"$i" != x"/usr/lib"; then
- ac_cv_path_$1_lib="-L$i -l$1"
+ ac_cv_path_$1_lib="-L$i -l$name"
break
else
ac_cv_path_$1_lib=""
@@ -165,6 +178,6 @@
AC_DEFUN([GNASH_PKG_FIND], dnl GNASH_PKG_FIND(cairo, [cairo.h], [cairo render
library], cairo_status)
[
-GNASH_PKG_INCLUDES($1, $2, $3)
-GNASH_PKG_LIBS($1, $4, $3)
+GNASH_PKG_INCLUDES($1, $2, $3, $5)
+GNASH_PKG_LIBS($1, $4, $3, $5)
])
Index: macros/gstreamer.m4
===================================================================
RCS file: macros/gstreamer.m4
diff -N macros/gstreamer.m4
--- macros/gstreamer.m4 29 Oct 2006 18:34:10 -0000 1.22
+++ /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: gstreamer.m4,v 1.22 2006/10/29 18:34:10 rsavoye Exp $
-
-AC_DEFUN([GNASH_PATH_GSTREAMER],
-[
- dnl Look for the header
- AC_ARG_WITH(gst_incl, AC_HELP_STRING([--with-gst-incl], [directory where
libgstreamer header is]), with_gstreamer_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_gstreamer_incl,[
- if test x"${with_gstreamer_incl}" != x ; then
- if test -f ${with_gstreamer_incl}/gst/gst.h ; then
- ac_cv_path_gstreamer_incl=-I`(cd ${with_gstreamer_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_gstreamer_incl} directory doesn't contain
gst/gst.h])
- fi
- fi])
-
- dnl Try with pkg-config
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gstreamer_incl}" = x; then
- $PKG_CONFIG --exists gstreamer-0.10 &&
ac_cv_path_gstreamer_incl=`$PKG_CONFIG --cflags gstreamer-0.10`
- fi
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_gstreamer_incl}" = x; then
-
- AC_MSG_CHECKING([for libgstreamer header])
- incllist="/sw/include /usr/local/include /home/latest/include
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
-
- for i in $incllist; do
- if test -f $i/gstr/gst.h; then
- ac_cv_path_gstreamer_incl="-I$i"
- break;
- else
- if test -f $i/gstreamer-0.10/gst/gst.h; then
- ac_cv_path_gstreamer_incl="-I$i/gstreamer-0.10"
- break
- fi
- fi
- done
-
- if test x"${ac_cv_path_gstreamer_incl}" != x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- fi
-
- if test x"${ac_cv_path_gstreamer_incl}" != x ; then
- GSTREAMER_CFLAGS="${ac_cv_path_gstreamer_incl}"
- else
- GSTREAMER_CFLAGS=""
- fi
-
-
-
- dnl Look for the library
- AC_ARG_WITH(gst_lib, AC_HELP_STRING([--with-gst-lib], [directory where
gstreamer library is]), with_gstreamer_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_gstreamer_lib,[
- if test x"${with_gstreamer_lib}" != x ; then
- if test -f ${with_gstreamer_lib}/libgstreamer-0.10.so; then
- ac_cv_path_gstreamer_lib="-L`(cd ${with_gstreamer_lib}; pwd)`
-lgstreamer-0.10"
- else
- AC_MSG_ERROR([${with_gstreamer_lib} directory doesn't contain
libgstreamer-0.10.so.])
- fi
- fi
- ])
-
- dnl Try with pkg-config
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gstreamer_lib}" = x; then
- $PKG_CONFIG --exists gstreamer-0.10 &&
ac_cv_path_gstreamer_lib=`$PKG_CONFIG --libs gstreamer-0.10`
- fi
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_gstreamer_lib}" = x; then
-
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/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/gstreamer-0.10/libgstreamer-0.10.so; then
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_gstreamer_lib="-L$i -lgstreamer-0.10"
- break
- else
- ac_cv_path_gstreamer_lib="-lgstreamer-0.10"
- break
- fi
- else
- if test -f $i/libgstreamer-0.10.a -o -f $i/gstreamer-0.10.so;
then
- ac_cv_path_gstreamer_lib="-L$i/gstreamer-0.10
-lgstreamer-0.10"
- break
- fi
- fi
- done
-
- fi
-
- if test x"${ac_cv_path_gstreamer_lib}" != x ; then
- GSTREAMER_LIBS="${ac_cv_path_gstreamer_lib}"
- else
- GSTREAMER_LIBS=""
- fi
-
- dnl
- dnl Call AC_CHECK_HEADERS here to
- dnl get HAVE_* macros automatically defined
- dnl
- dnl NOTE: we need additional CFLAGS for things to work
- dnl (stuff included by gstreamer header)
- dnl
-
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS $GSTREAMER_CFLAGS $GLIB_CFLAGS $LIBXML_CFLAGS"
- CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS $GLIB_CFLAGS $LIBXML_CFLAGS"
- dnl echo "GST: CFLAGS=${CFLAGS} CPPFLAGS=${CPPFLAGS}"
- AC_CHECK_HEADERS(gst/gst.h)
- CFLAGS="$ac_save_CFLAGS"
- CPPFLAGS="$ac_save_CPPFLAGS"
-
- dnl
- dnl Call AC_CHECK_LIB here to
- dnl make sure gstreamer actually works
- dnl
-
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $GSTREAMER_LIBS"
- dnl echo "GSTREAMER LIBS=${LIBS}"
- AC_CHECK_LIB(gstreamer-0.10, gst_init, [gstreamer_lib_ok="yes"],
[gstreamer_lib_ok="no"])
- LIBS="$ac_save_LIBS"
-
- if test x"${gstreamer_lib_ok}" = xno; then
- GSTREAMER_LIBS=""
- fi
-
-
- AC_SUBST(GSTREAMER_CFLAGS)
- AC_SUBST(GSTREAMER_LIBS)
-])
- [Gnash-commit] gnash configure.ac macros/gnashpkgtool.m4 macro...,
Markus Gothe <=