[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac macros/cairo.m4 ma...
|
From: |
Markus Gothe |
|
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac macros/cairo.m4 ma... |
|
Date: |
Sat, 25 Nov 2006 18:16:04 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/11/25 18:16:04
Modified files:
. : ChangeLog configure.ac
Removed files:
macros : cairo.m4 mad.m4 ogg.m4 png.m4 vorbis.m4
Log message:
Major cleanup...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1768&r2=1.1769
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.203&r2=1.204
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.12&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mad.m4?cvsroot=gnash&r1=1.22&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&r1=1.20&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/png.m4?cvsroot=gnash&r1=1.18&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/vorbis.m4?cvsroot=gnash&r1=1.3&r2=0
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1768
retrieving revision 1.1769
diff -u -b -r1.1768 -r1.1769
--- ChangeLog 25 Nov 2006 16:30:04 -0000 1.1768
+++ ChangeLog 25 Nov 2006 18:16:04 -0000 1.1769
@@ -37,6 +37,7 @@
* configure.ac: List FLTK and RISCOS as params to --enable-gui.
* libbase/rc.h: DSOLOCAL -> DSOEXPORT.
* configure.ac: Try-out of finding zlib with generic macro.
+ * macros/: major clean-up...
2006-11-24 Rob Savoye <address@hidden>
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- configure.ac 25 Nov 2006 12:28:42 -0000 1.203
+++ configure.ac 25 Nov 2006 18:16:04 -0000 1.204
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.203 2006/11/25 12:28:42 nihilus Exp $
+dnl $Id: configure.ac,v 1.204 2006/11/25 18:16:04 nihilus Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -452,7 +452,7 @@
GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
dnl currently unused
-dnl GNASH_PATH_PNG
+dnl GNASH_PKG_FIND(png, [png.h], [playing oggs], ogg_sync_init)
GNASH_PATH_MING
AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
@@ -460,7 +460,7 @@
AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
dnl currently unused
-dnl GNASH_PATH_OGG
+dnl GNASH_PKG_FIND(ogg, [ogg.h], [jpeg images], jpeg_mem_init)
if test x$gui = xsdl -o x$sound_handler = xsdl; then
GNASH_PATH_SDL
@@ -535,7 +535,7 @@
GNASH_PATH_XFT
GNASH_PATH_GHELP
dnl Using GTK always needs Cairo, even with OpenGL
- GNASH_PATH_CAIRO
+ GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
fi
AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
@@ -586,7 +586,7 @@
if test x"$mp3_decoder" = x"mad"; then
dnl Will set MAD_LIBS and MAD_CFLAGS.
dnl Handles --with-mad-incl and --with-mad-lib
- GNASH_PATH_MAD
+ GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
if test x"${ac_cv_path_mad_lib}" = x ; then
mp3_decoder=none
sound_handler=none
Index: macros/cairo.m4
===================================================================
RCS file: macros/cairo.m4
diff -N macros/cairo.m4
--- macros/cairo.m4 9 Nov 2006 18:28:15 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,122 +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: cairo.m4,v 1.12 2006/11/09 18:28:15 nihilus Exp $
-
-AC_DEFUN([GNASH_PATH_CAIRO],
-[
- dnl Look for the header
- AC_ARG_WITH(cairo_incl, AC_HELP_STRING([--with-cairo_incl], [directory where
libcairo header is]), with_cairo_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_cairo_incl,[
- if test x"${with_cairo_incl}" != x ; then
- if test -f ${with_cairo_incl}/cairo.h ; then
- ac_cv_path_cairo_incl=`(cd ${with_cairo_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_cairo_incl} directory doesn't contain cairo.h])
- fi
- fi
- ])
-
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_cairo_incl}" = x; then
- $PKG_CONFIG --exists cairo && ac_cv_path_cairo_incl=`$PKG_CONFIG
--cflags cairo`
-fi
-
- dnl we can use cairo even if no plugin is enabled
- dnl if test x"$plugin" = x"yes"; then
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_cairo_incl}" = x; then
- AC_CHECK_HEADERS(cairo/cairo.h, [ac_cv_path_cairo_incl=""],[
- if test x"${ac_cv_path_cairo_incl}" = x; then
- 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/cairo/cairo.h; then
- ac_cv_path_cairo_incl="$i/cairo"
- fi
- done
- fi
- ])
- if test x"${ac_cv_path_cairo_incl}" != x"/usr/include"; then
- ac_cv_path_cairo_incl="-I${ac_cv_path_cairo_incl}"
- else
- ac_cv_path_cairo_incl=""
- fi
-
- else
- AC_MSG_CHECKING([for libcairo header])
- AC_MSG_RESULT(${ac_cv_path_cairo_incl})
- fi
-
-
- dnl Look for the library
- AC_ARG_WITH(cairo_lib, AC_HELP_STRING([--with-cairo-lib], [directory where
cairo library is]), with_cairo_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_cairo_lib,[
- if test x"${with_cairo_lib}" != x ; then
- if test -f ${with_cairo_lib}/libcairo.a -o -f
${with_cairo_lib}/libcairo.so; then
- ac_cv_path_cairo_lib=`(cd ${with_cairo_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_cairo_lib} directory doesn't contain libcairo.])
- fi
- fi
- ])
-
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_cairo_lib}" = x; then
- $PKG_CONFIG --exists cairo && ac_cv_path_cairo_lib=`$PKG_CONFIG --libs
cairo`
- fi
-
- dnl If the header doesn't exist, there is no point looking for the library.
- if test x"${ac_cv_path_cairo_lib}" = x; then
- AC_CHECK_LIB(cairo, cairo_status, [ac_cv_path_cairo_lib="-lcairo"],[
- libslist="/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/libcairo.a -o -f $i/libcairo.so; then
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_cairo_lib="-L$i -lcairo"
- break
- else
- ac_cv_path_cairo_lib=""
- break
- fi
- fi
- done
- ])
- else
- AC_MSG_CHECKING([for libcairo library])
- AC_MSG_RESULT(${ac_cv_path_cairo_lib})
- fi
-
- dnl we seek cairo even if no plugin is enabled
- dnl fi
-
- if test x"${ac_cv_path_cairo_incl}" != x ; then
- CAIRO_CFLAGS="${ac_cv_path_cairo_incl}"
- else
- CAIRO_CFLAGS=""
- fi
-
- if test x"${ac_cv_path_cairo_lib}" != x ; then
- CAIRO_LIBS="${ac_cv_path_cairo_lib}"
- else
- CAIRO_LIBS=""
- fi
-
- AC_SUBST(CAIRO_CFLAGS)
- AC_SUBST(CAIRO_LIBS)
-])
Index: macros/mad.m4
===================================================================
RCS file: macros/mad.m4
diff -N macros/mad.m4
--- macros/mad.m4 5 Nov 2006 11:34:56 -0000 1.22
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,117 +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 $Id: mad.m4,v 1.22 2006/11/05 11:34:56 nihilus Exp $
-
-AC_DEFUN([GNASH_PATH_MAD],
-[
- dnl Look for the header
- AC_ARG_WITH(mad_incl, AC_HELP_STRING([--with-mad_incl], [directory where
libmad header is]), with_mad_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_mad_incl,[
- if test x"${with_mad_incl}" != x ; then
- if test -f ${with_mad_incl}/mad.h ; then
- ac_cv_path_mad_incl=`(cd ${with_mad_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_mad_incl} directory doesn't contain mad.h])
- fi
- fi
- ])
-
-
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_mad_incl}" = x; then
- $PKG_CONFIG --exists mad && ac_cv_path_mad_incl=`$PKG_CONFIG --cflags
mad`
- fi
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_mad_incl}" = x; then
- AC_CHECK_HEADERS(mad.h, [ac_cv_path_mad_incl=""],[
- if test x"${ac_cv_path_mad_incl}" = x; then
- incllist="${prefix}/include /sw/include /opt/local/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/mad.h; then
- if test x"$i" != x"/usr/include"; then
- ac_cv_path_mad_incl="-I$i"
- break
- else
- ac_cv_path_mad_incl=""
- break
- fi
- fi
- done
- fi])
- else
- if test x"${ac_cv_path_mad_incl}" != x"/usr/include"; then
- ac_cv_path_mad_incl="${ac_cv_path_mad_incl}"
- else
- ac_cv_path_mad_incl=""
- fi
- fi
- AC_MSG_CHECKING([for libmad header])
- AC_MSG_RESULT(${ac_cv_path_mad_incl})
-
- if test x"${ac_cv_path_mad_incl}" != x ; then
- MAD_CFLAGS="${ac_cv_path_mad_incl}"
- else
- MAD_CFLAGS=""
- fi
-
- dnl Look for the library
- AC_ARG_WITH(mad_lib, AC_HELP_STRING([--with-mad-lib], [directory where mad
library is]), with_mad_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_mad_lib,[
- if test x"${with_mad_lib}" != x ; then
- if test -f ${with_mad_lib}/libmad.a -o -f ${with_mad_lib}/libmad.so;
then
- ac_cv_path_mad_lib="-L`(cd ${with_mad_lib}; pwd)` -lmad"
- else
- AC_MSG_ERROR([${with_mad_lib} directory doesn't contain libmad.])
- fi
- fi
- ])
-
- 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_mad_lib}" = x; then
- $PKG_CONFIG --exists mad && ac_cv_path_mad_lib=`$PKG_CONFIG --libs mad`
- fi
-
- if test x"${ac_cv_path_mad_lib}" = x; then
- AC_CHECK_LIB(mad, mad_copyright, [ac_cv_path_mad_lib="-lmad"],[
- libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /opt/local/lib
/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/libmad.a -o -f $i/libmad.so; then
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_mad_lib="-L$i -lmad"
- break
- else
- ac_cv_path_mad_lib="-lmad"
- break
- fi
- fi
- done
- ])
- fi
-
- AC_MSG_CHECKING([for libmad library])
- AC_MSG_RESULT(${ac_cv_path_mad_lib})
-
- if test x"${ac_cv_path_mad_lib}" != x ; then
- MAD_LIBS="${ac_cv_path_mad_lib}"
- else
- MAD_LIBS=""
- fi
-
- AC_SUBST(MAD_CFLAGS)
- AC_SUBST(MAD_LIBS)
-])
Index: macros/ogg.m4
===================================================================
RCS file: macros/ogg.m4
diff -N macros/ogg.m4
--- macros/ogg.m4 29 Oct 2006 18:34:10 -0000 1.20
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,132 +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: ogg.m4,v 1.20 2006/10/29 18:34:10 rsavoye Exp $
-
-AC_DEFUN([GNASH_PATH_OGG],
-[
- AC_ARG_ENABLE(ogg, AC_HELP_STRING([--enable-ogg], [Enable support for
playing oggs]),
- [case "${enableval}" in
- yes) ogg=yes ;;
- no) ogg=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-ogg option]) ;;
- esac], ogg=yes)
-
- if test x"$ogg" = x"yes"; then
- dnl Look for the header
- AC_ARG_WITH(ogg_incl, AC_HELP_STRING([--with-ogg_incl], [directory where
libogg header is]), with_ogg_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_ogg_incl,[
- if test x"${with_ogg_incl}" != x ; then
- if test -f "${with_ogg_incl}/ogg.h" ; then
- ac_cv_path_ogg_incl=-I`(cd ${with_ogg_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_ogg_incl} directory doesn't contain ogg.h])
- fi
- fi
- ])
-
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ogg_incl}" = x; then
- $PKG_CONFIG --exists ogg && ac_cv_path_ogg_incl=`$PKG_CONFIG --cflags
ogg`
- fi
-
- dnl If the path hasn't been specified, go look for it.
- if test x"${ac_cv_path_ogg_incl}" = x; then
- AC_CHECK_HEADERS(ogg.h, [ac_cv_path_ogg_incl=""],[
- if test x"${ac_cv_path_ogg_incl}" = x; then
- incllist="${prefix}/include /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/ogg/ogg.h; then
- if test x"$i" != x"/usr/include"; then
- ac_cv_path_ogg_incl="-I$i"
- break
- else
- ac_cv_path_ogg_incl=""
- break
- fi
- fi
- done
- fi])
- else
- if test x"${ac_cv_path_ogg_incl}" != x"/usr/include"; then
- ac_cv_path_ogg_incl="${ac_cv_path_ogg_incl}"
- else
- ac_cv_path_ogg_incl=""
- fi
- fi
- AC_MSG_CHECKING([for libogg header])
- AC_MSG_RESULT(${ac_cv_path_ogg_incl})
-
- if test x"${ac_cv_path_ogg_incl}" != x ; then
- OGG_CFLAGS="${ac_cv_path_ogg_incl}"
- else
- OGG_CFLAGS=""
- fi
-
- dnl Look for the library
- AC_ARG_WITH(ogg_lib, AC_HELP_STRING([--with-ogg-lib], [directory where
ogg library is]), with_ogg_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_ogg_lib,[
- if test x"${with_ogg_lib}" != x ; then
- if test -f "${with_ogg_lib}/libogg.a" -o -f
"${with_ogg_lib}/libogg.so"; then
- ac_cv_path_ogg_lib="-L`(cd ${with_ogg_incl}; pwd)` -logg"
- else
- AC_MSG_ERROR([${with_ogg_lib} directory doesn't contain libogg.])
- fi
- fi
- ])
-
- 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_ogg_lib}" = x; then
- $PKG_CONFIG --exists ogg && ac_cv_path_ogg_lib=`$PKG_CONFIG --libs ogg`
- fi
-
- if test x"${ac_cv_path_ogg_lib}" = x; then
- AC_CHECK_LIB(ogg, ogg_sync_init, [ac_cv_path_ogg_lib="-logg"],[
- 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/libogg.a" -o -f "$i/libogg.so"; then
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_ogg_lib="-L$i -logg"
- break
- else
- ac_cv_path_ogg_lib=""
- break
- fi
- fi
- done])
- fi
- AC_MSG_CHECKING([for libogg library])
- AC_MSG_RESULT(${ac_cv_path_ogg_lib})
-
- if test x"${ac_cv_path_ogg_lib}" != x ; then
- OGG_LIBS="${ac_cv_path_ogg_lib}"
- else
- OGG_LIBS=""
- fi
- fi
-
- if test x"${ac_cv_path_ogg_lib}" != x ; then
- OGG_LIBS="${ac_cv_path_ogg_lib}"
- fi
-
- AM_CONDITIONAL(OGG, [test x$ogg = xyes])
-
- AC_SUBST(OGG_CFLAGS)
- AC_SUBST(OGG_LIBS)
-])
Index: macros/png.m4
===================================================================
RCS file: macros/png.m4
diff -N macros/png.m4
--- macros/png.m4 4 Nov 2006 00:00:30 -0000 1.18
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,138 +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: png.m4,v 1.18 2006/11/04 00:00:30 rsavoye Exp $
-
-AC_DEFUN([GNASH_PATH_PNG],
-[
- AC_ARG_ENABLE(png, AC_HELP_STRING([--enable-png], [Enable support for png
images]),
- [case "${enableval}" in
- yes) png=yes ;;
- no) png=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-png option]) ;;
- esac], png=yes)
-
- if test x"$png" = x"yes"; then
- dnl Look for the header
- AC_ARG_WITH(png_incl, AC_HELP_STRING([--with-png-incl], [directory where
libpng header is]), with_png_incl=${withval})
- AC_CACHE_VAL(ac_cv_path_png_incl, [
- if test x"${with_png_incl}" != x ; then
- if test -f ${with_png_incl}/png.h ; then
- ac_cv_path_png_incl=-I`(cd ${with_png_incl}; pwd)`
- else
- AC_MSG_ERROR([${with_png_incl} directory doesn't contain png.h])
- fi
- fi
- ])
-
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_png_incl}" = x; then
- $PKG_CONFIG --exists libpng && ac_cv_path_png_incl=`$PKG_CONFIG --cflags
libpng`
- fi
-
- dnl If the path hasn't been specified, go look for it.
- AC_MSG_CHECKING([for libpng header])
- if test x"${ac_cv_path_png_incl}" = x; then
- AC_CHECK_HEADERS(png.h, [ac_cv_path_png_incl=""],[
- if test x"${ac_cv_path_png_incl}" = x; then
- incllist="${prefix}/${target_alias}/include ${prefix}/include
/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/png.h; then
- if test x"$i" != x"/usr/include"; then
- ac_cv_path_png_incl="-I$i"
- break
- else
- ac_cv_path_png_incl=""
- break
- fi
- else
-dnl
- if test -f $i/libpng/png.h; then
- ac_cv_path_png_incl="-I$i/libpng"
- break
- fi
- fi
- done
- fi])
- else
- if test x"${ac_cv_path_png_incl}" != x"/usr/include"; then
- ac_cv_path_png_incl="${ac_cv_path_png_incl}"
- else
- ac_cv_path_png_incl=""
- fi
- fi
- AC_MSG_RESULT(${ac_cv_path_png_incl})
-
- if test x"${ac_cv_path_png_incl}" != x ; then
- PNG_CFLAGS="${ac_cv_path_png_incl}"
- else
- PNG_CFLAGS=""
- fi
-
- dnl Look for the library
- AC_ARG_WITH(png_lib, AC_HELP_STRING([--with-png-lib], [directory where
png library is]), with_png_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_png_lib,[
- if test x"${with_png_lib}" != x ; then
- AC_MSG_CHECKING([for libpng library in specified directory])
- if test -f ${with_png_lib}/libpng.a -o -f ${with_png_lib}/libpng.so;
then
- tmp=`(cd ${with_png_lib}; pwd)`
- ac_cv_path_png_lib="-L${tmp} -lpng"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([${with_png_lib} directory doesn't contain libpng.])
- AC_MSG_RESULT([no])
- fi
- fi
- ])
-
- 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_png_lib}" = x; then
- $PKG_CONFIG --exists libpng && ac_cv_path_png_lib=`$PKG_CONFIG --libs
libpng`
- fi
- AC_MSG_CHECKING([for libpng library])
- if test x"${ac_cv_path_png_lib}" = x; then
- AC_CHECK_LIB(png, png_check_sig, [ac_cv_path_png_lib=""],[
-
- libslist="${prefix}/${target_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/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
- ac_cv_path_png_lib="-L$i -lpng"
- break
- else
- ac_cv_path_png_lib=""
- break
- fi
- fi
- done])
- fi
- fi
-
- AC_MSG_RESULT(${ac_cv_path_png_lib})
- if test x"${ac_cv_path_png_lib}" != x ; then
- PNG_LIBS="${ac_cv_path_png_lib}"
- else
- PNG_LIBS=""
- fi
-
- AM_CONDITIONAL(HAVE_PNG, [test x$png = xyes])
-
- AC_SUBST(PNG_CFLAGS)
- AC_SUBST(PNG_LIBS)
-])
Index: macros/vorbis.m4
===================================================================
RCS file: macros/vorbis.m4
diff -N macros/vorbis.m4
--- macros/vorbis.m4 15 Oct 2006 14:26:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,122 +0,0 @@
-# Configure paths for libvorbis
-# Jack Moffitt <address@hidden> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-# thomasvs added check for vorbis_bitrate_addblock which is new in rc3
-
-dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_VORBIS],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(vorbis, AC_HELP_STRING([--with-vorbis=PFX], [Prefix where
libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_WITH(vorbis-libraries, AC_HELP_STRING([--with-vorbis-libraries=DIR],
[Directory where libvorbis library is installed (optional)]),
vorbis_libraries="$withval", vorbis_libraries="")
-AC_ARG_WITH(vorbis-includes, AC_HELP_STRING([--with-vorbis-includes=DIR],
[Directory where libvorbis header files are installed (optional)]),
vorbis_includes="$withval", vorbis_includes="")
-AC_ARG_ENABLE(vorbistest, AC_HELP_STRING([--disable-vorbistest], [Do not try
to compile and run a test Vorbis program]),, enable_vorbistest=yes)
-
- if test "x$vorbis_libraries" != "x" ; then
- VORBIS_LIBS="-L$vorbis_libraries"
- elif test "x$vorbis_prefix" != "x" ; then
- VORBIS_LIBS="-L$vorbis_prefix/lib"
- elif test "x$prefix" != "xNONE"; then
- VORBIS_LIBS="-L$prefix/lib"
- fi
-
- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
- VORBISFILE_LIBS="-lvorbisfile"
- VORBISENC_LIBS="-lvorbisenc"
-
- if test "x$vorbis_includes" != "x" ; then
- VORBIS_CFLAGS="-I$vorbis_includes"
- elif test "x$vorbis_prefix" != "x" ; then
- VORBIS_CFLAGS="-I$vorbis_prefix/include"
- elif test "x$prefix" != "xNONE"; then
- VORBIS_CFLAGS="-I$prefix/include"
- fi
-
-
- AC_MSG_CHECKING(for Vorbis)
- no_vorbis=""
-
-
- if test "x$enable_vorbistest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
- LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Vorbis is sufficiently new.
-dnl
- rm -f conf.vorbistest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-int main ()
-{
- vorbis_block vb;
- vorbis_dsp_state vd;
- vorbis_info vi;
-
- vorbis_info_init (&vi);
- vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
- vorbis_analysis_init (&vd, &vi);
- vorbis_block_init (&vd, &vb);
- /* this function was added in 1.0rc3, so this is what we're testing for */
- vorbis_bitrate_addblock (&vb);
-
- system("touch conf.vorbistest");
- return 0;
-}
-
-],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_vorbis" = "x" ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.vorbistest ; then
- :
- else
- echo "*** Could not run Vorbis test program, checking why..."
- CFLAGS="$CFLAGS $VORBIS_CFLAGS"
- LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <vorbis/codec.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually
means"
- echo "*** that the run-time linker is not finding Vorbis or finding the
wrong"
- echo "*** version of Vorbis. If it is not finding Vorbis, you'll need
to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf
to point"
- echo "*** to the installed location Also, make sure you have run
ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove
it, although"
- echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file
config.log for the"
- echo "*** exact error that occured. This usually means Vorbis was
incorrectly installed"
- echo "*** or that you have moved Vorbis since it was installed." ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- VORBIS_CFLAGS=""
- VORBIS_LIBS=""
- VORBISFILE_LIBS=""
- VORBISENC_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(VORBIS_CFLAGS)
- AC_SUBST(VORBIS_LIBS)
- AC_SUBST(VORBISFILE_LIBS)
- AC_SUBST(VORBISENC_LIBS)
- rm -f conf.vorbistest
-])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog configure.ac macros/cairo.m4 ma...,
Markus Gothe <=