[Gnash-commit] gnash ChangeLog Makefile.am configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/08 19:31:21

Modified files:
        .              : ChangeLog Makefile.am configure.ac 

Log message:
                * Makefile.am (dumpconfig): add info about which extensions are 
being
                  built (if not null extensions are scanned, would be better to
                  just report wheter extensions are buil or not instead..)
                * configure.ac: define USE_EXTENSIONS if build of any extension 
is
                  enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3126&r2=1.3127
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.303&r2=1.304

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3126
retrieving revision 1.3127
diff -u -b -r1.3126 -r1.3127
--- ChangeLog   8 May 2007 17:05:53 -0000       1.3126
+++ ChangeLog   8 May 2007 19:31:21 -0000       1.3127
@@ -1,9 +1,17 @@
+2007-05-08 Sandro Santilli <address@hidden>
+
+       * Makefile.am (dumpconfig): add info about which extensions are being
+         built (if not null extensions are scanned, would be better to 
+         just report wheter extensions are buil or not instead..)
+       * configure.ac: define USE_EXTENSIONS if build of any extension is
+         enabled.
+
 2007-05-08 Udo Giacomozzi <address@hidden>
 
        * backend/render_handler_agg.cpp: Fix vector alignment ("pixel
          hinting"). Fixes bug #19775. 
 
-2007-05-07 Sandro Santilli <address@hidden>
+2007-05-08 Sandro Santilli <address@hidden>
 
        * libbase/LoadThread.h: threading enabled by default.
        * macros/ffmpeg.m4: set LIBS and CFLAGS to the detected or provided

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- Makefile.am 30 Apr 2007 18:53:25 -0000      1.70
+++ Makefile.am 8 May 2007 19:31:21 -0000       1.71
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.70 2007/04/30 18:53:25 strk Exp $
+# $Id: Makefile.am,v 1.71 2007/05/08 19:31:21 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -245,3 +245,4 @@
        @echo "Media handler: $(MEDIA_OPT)"
        @echo "Renderer engine: $(RENDER_OPT)"
        @echo "GUI: $(GUI_OPT)"
+       @echo "Extensions: $(EXTENSIONS_LIST)"

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- configure.ac        7 May 2007 14:49:48 -0000       1.303
+++ configure.ac        8 May 2007 19:31:21 -0000       1.304
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.303 2007/05/07 14:49:48 martinwguy Exp $
+dnl $Id: configure.ac,v 1.304 2007/05/08 19:31:21 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -316,6 +316,7 @@
     extlist="${withval}"
     withval=`echo ${withval} | tr '\054' ' ' `
   fi
+  nextensions=0
   while test -n "${withval}" ; do
     val=`echo ${withval} | cut -d ' ' -f 1`
     extensions_list="${extensions_list} ${val}"
@@ -324,28 +325,33 @@
         AC_DEFINE(USE_DEJAGNU_EXT, [1], [Build the DejaGnu extension])
         AC_MSG_NOTICE([Adding DejaGnu extension])
         ext_dejagnu=yes
+        nextensions=$((nextensions+1))
         ;;
       mysql|MYSQL|sql|SQL)
         AC_DEFINE(USE_MYSQL_EXT, [1], [Build the MySQL extension])
         AC_MSG_NOTICE([Adding MySql extension])
         ext_mysql=yes
+        nextensions=$((nextensions+1))
         ;;
       fileio|FILEIO|io|IO)
         AC_DEFINE(USE_FILEIO_EXT, [1], [Build the FileIO extension])
         AC_MSG_NOTICE([Adding FileIO extension])
         ext_fileio=yes
+        nextensions=$((nextensions+1))
         ;;
       gtk|GTK|gtk2|GTK2)
-        AC_DEFINE(USE_GTK_EXT, [1], [Build the FileIO extension])
+        AC_DEFINE(USE_GTK_EXT, [1], [Build the GTK extension])
         ext_gtk=yes
+        nextensions=$((nextensions+1))
         ;;
       all|ALL)
-        AC_DEFINE(USE_GTK_EXT, [1], [Build the FileIO extension])
+        AC_DEFINE(USE_GTK_EXT, [1], [Build all the extensions])
         ext_dejagnu=yes
         ext_mysql=yes
         ext_fileio=yes
         ext_gtk=yes
         ext_all=yes
+        nextensions=5
         ;;
       *) AC_MSG_ERROR([invalid extension specified: ${withval} given (accept: 
MYSQL|DEJAGNU|FILEIO|GTK|ALL)])
          ;;
@@ -355,6 +361,11 @@
       break;
     fi
   done
+  if test "${nextensions}" -gt 0; then
+        AC_DEFINE(USE_EXTENSIONS, [1], [Use extensions])
+  fi
+  EXTENSIONS_LIST="$extensions_list"
+  AC_SUBST(EXTENSIONS_LIST)
 )
 
 AM_CONDITIONAL(BUILD_DEJAGNU_EXT, [ test x$ext_dejagnu = xyes ])