[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash macros/ming.m4 Makefile.am configure.ac
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash macros/ming.m4 Makefile.am configure.ac |
Date: |
Tue, 02 Jan 2007 15:10:02 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/01/02 15:10:02
Modified files:
macros : ming.m4
. : Makefile.am configure.ac
Log message:
* macros/ming.m4: synced with the version in Ming repository.
Basically add MING_VERSION and MING_VERSION_CODE variable,
we'll use them to detect wheter 'asm' or specific features
are supported.
* Makefile.am: show Ming stuff on 'make dumpconfig'
* configure.ac: print Ming stuff on summary, properly invoke
the Ming macro (renamed from GNASH_PATH_MING to AC_PATH_MING).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.226&r2=1.227
Patches:
Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- macros/ming.m4 29 Oct 2006 18:34:10 -0000 1.8
+++ macros/ming.m4 2 Jan 2007 15:10:02 -0000 1.9
@@ -13,33 +13,34 @@
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
# Configure paths for Ming
-# Sandro Santilli 2006-01-24
+# Author: Sandro Santilli <address@hidden>
#
# This macro uses ming-config, which was
-# not available as for Ming 0.3beta1
-#
+# not available as of Ming 0.3beta1
#
#
# Use:
# AC_PATH_MING
#
# Provides:
+# MING_VERSION - Ming version string (example: "0.4.1" or
"0.4.0.beta2")
+# MING_VERSION_CODE - a 8digits number encoding Major, Minor, Patch and
Beta numbers.
+# examples: 00040002 (0.4.0.beta2) 00040100 (0.4.1)
# MING_CFLAGS
# MING_LIBS
# MAKESWF
#
-AC_DEFUN([GNASH_PATH_MING],
+AC_DEFUN([AC_PATH_MING],
[
MING_CFLAGS=""
MING_LIBS=""
- AC_ARG_WITH(ming, AC_HELP_STRING([--with-ming=[<ming-config>]], [Use
ming to build tests]),
+ AC_ARG_WITH(ming,[ --with-ming=[<ming-config>] Path to the
ming-config command],
[
case "${withval}" in
yes|no)
@@ -54,6 +55,15 @@
fi
if test x"$MING_CONFIG" != "x"; then
+ MING_VERSION=`$MING_CONFIG --version`
+ major=`echo $MING_VERSION | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ minor=`echo $MING_VERSION | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ micro=`echo $MING_VERSION | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ beta=`echo $MING_VERSION | sed -e 's/.*beta\([[0-9]]*\).*/\1/'`
+ MING_VERSION_CODE=`printf %2.2d%2.2d%2.2d%2.2d $major $minor
$micro $beta`
MING_CFLAGS=`$MING_CONFIG --cflags`
MING_LIBS=`$MING_CONFIG --libs`
MING_PATH=`$MING_CONFIG --bindir`
@@ -61,6 +71,8 @@
fi
+ AC_SUBST(MING_VERSION_CODE)
+ AC_SUBST(MING_VERSION)
AC_SUBST(MING_CFLAGS)
AC_SUBST(MING_LIBS)
AC_SUBST(MAKESWF)
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Makefile.am 28 Dec 2006 02:39:18 -0000 1.55
+++ Makefile.am 2 Jan 2007 15:10:02 -0000 1.56
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.55 2006/12/28 02:39:18 strk Exp $
+# $Id: Makefile.am,v 1.56 2007/01/02 15:10:02 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -190,6 +190,10 @@
@echo "AGG_LIBS is $(AGG_LIBS)"
@echo "INCLTDL $(INCLTDL) "
@echo "LIBLTDL $(LIBLTDL) "
+ @echo "MING_VERSION_CODE $(MING_VERSION_CODE) "
+ @echo "MING_LIBS $(MING_LIBS) "
+ @echo "MING_CFLAGS $(MING_CFLAGS) "
+ @echo "MAKESWF $(MAKESWF) "
@echo "A blank value for CFLAGS means the header is installed in the"
@echo "default system header location. All the LIBS should have a"
@echo "legit value"
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- configure.ac 17 Dec 2006 20:24:57 -0000 1.226
+++ configure.ac 2 Jan 2007 15:10:02 -0000 1.227
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.226 2006/12/17 20:24:57 rsavoye Exp $
+dnl $Id: configure.ac,v 1.227 2007/01/02 15:10:02 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -454,8 +454,9 @@
dnl currently unused
dnl GNASH_PKG_FIND(png, [png.h], [playing oggs], ogg_sync_init)
-GNASH_PATH_MING
+AC_PATH_MING
AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
+
AC_PATH_PROG(DOXYGEN, doxygen)
AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
@@ -1329,6 +1330,18 @@
nogo=true
fi
+if test x"$MING_LIBS" != x; then
+ echo " MING version code is $MING_VERSION_CODE"
+ echo " MING flags are $MING_CFLAGS"
+ echo " MING libs are $MING_LIBS"
+ echo " MAKESWF is $MAKESWF"
+else
+ echo "Warning: \
+ You need to have the Ming development and utilities packages installed \
+ to run most of the tests in Gnash testsuite. Some of the tests will be \
+ run anyway."
+fi
+
# If anything critical is missing, don't bother to continue
if test x"$nogo" = x"true"; then
echo ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash macros/ming.m4 Makefile.am configure.ac,
Sandro Santilli <=