[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/26 11:17:43

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        AC_DEFINE_UNQUOTED saved the day (rush hacking)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6404&r2=1.6405
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.519&r2=1.520

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6404
retrieving revision 1.6405
diff -u -b -r1.6404 -r1.6405
--- ChangeLog   26 Apr 2008 10:47:28 -0000      1.6404
+++ ChangeLog   26 Apr 2008 11:17:42 -0000      1.6405
@@ -1,5 +1,10 @@
 2008-04-26 Sandro Santilli <address@hidden>
 
+       * configure.ac: AC_DEFINE_UNQUOTED saved the day
+         (rush hacking)
+
+2008-04-26 Sandro Santilli <address@hidden>
+
        * configure.ac: Oops, AC_DEFINE can't use variables,
          will need to generate sysgnash{plugin}rc on 'make'
          (as suggested by automake dox)

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -b -r1.519 -r1.520
--- configure.ac        26 Apr 2008 10:47:29 -0000      1.519
+++ configure.ac        26 Apr 2008 11:17:43 -0000      1.520
@@ -37,67 +37,83 @@
 dnl Set the default values for Flash Version. These are converted into
 dnl various strings to make JavaScript or ActionScript detectors
 dnl recognize Gnash as a Flash Player.
-AC_DEFINE([DEFAULT_FLASH_MAJOR_VERSION], ["9"], [Default Flash major version])
-AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], ["0"], [Default Flash minor version])
-AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], ["999"], [Default Flash revision number])
+DEFAULT_FLASH_MAJOR_VERSION="9"
+DEFAULT_FLASH_MINOR_VERSION="0"
+DEFAULT_FLASH_REV_NUMBER="999"
+AC_SUBST(DEFAULT_FLASH_MAJOR_VERSION)
+AC_SUBST(DEFAULT_FLASH_MINOR_VERSION)
+AC_SUBST(DEFAULT_FLASH_REV_NUMBER)
+
+AC_DEFINE_UNQUOTED([DEFAULT_FLASH_MAJOR_VERSION], 
["${DEFAULT_FLASH_MAJOR_VERSION}"], [Default Flash major version])
+AC_DEFINE_UNQUOTED([DEFAULT_FLASH_MINOR_VERSION], 
["${DEFAULT_FLASH_MINOR_VERSION}"], [Default Flash minor version])
+AC_DEFINE_UNQUOTED([DEFAULT_FLASH_REV_NUMBER], 
["${DEFAULT_FLASH_REV_NUMBER}"], [Default Flash revision number])
 
 dnl TODO: use host/build/target -- whatever is more appropriate
 case "${host}" in
   *-apple-*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["MAC"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["MacOS"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="MAC"
+    DEFAULT_FLASH_SYSTEM_OS="MacOS"
     ;;
   *-openbsd*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["OpenBSD"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="BSD"
+    DEFAULT_FLASH_SYSTEM_OS="OpenBSD"
     ;;
   *-freebsd*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["FreeBSD"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="BSD"
+    DEFAULT_FLASH_SYSTEM_OS="FreeBSD"
     ;;
   *-netbsd*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["NetBSD"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="BSD"
+    DEFAULT_FLASH_SYSTEM_OS="NetBSD"
     ;;
   *-linux-gnu)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["LNX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["GNU/Linux"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="LNX"
+    DEFAULT_FLASH_SYSTEM_OS="GNU/Linux"
     ;;
   *-linux*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["LNX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Linux"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="LNX"
+    DEFAULT_FLASH_SYSTEM_OS="Linux"
     ;;
   *-cygwin* | *-mingw* | *-pw32*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["WIN"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Windows"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="WIN"
+    DEFAULT_FLASH_SYSTEM_OS="Windows"
     ;;
   *-*solaris*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["SUN"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Solaris"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="SUN"
+    DEFAULT_FLASH_SYSTEM_OS="Solaris"
     ;;
   *-os2*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["OS2"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["OS/2"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="OS2"
+    DEFAULT_FLASH_SYSTEM_OS="OS/2"
     ;;
   *-sco*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["SCO"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["SCO/Unix"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="SCO"
+    DEFAULT_FLASH_SYSTEM_OS="SCO/Unix"
     ;;
   *-irix*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["IRX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["IRIX"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="IRX"
+    DEFAULT_FLASH_SYSTEM_OS="IRIX"
     ;;
   *-hpux*)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["HPX"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["HPUX"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="HPX"
+    DEFAULT_FLASH_SYSTEM_OS="HPUX"
     ;;    
   *)
-    AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["UNK"], [Default 3-letter platform 
identifier for version string])
-    AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Unknown"], [Default value for 
System.capabilities.os])
+    DEFAULT_FLASH_PLATFORM_ID="UNK"
+    DEFAULT_FLASH_SYSTEM_OS="Unknown"
     ;;
 esac
 
-AC_DEFINE([DEFAULT_STREAMS_TIMEOUT], [10], [Default streams timeout in 
seconds])
+AC_DEFINE_UNQUOTED([DEFAULT_FLASH_PLATFORM_ID], 
["${DEFAULT_FLASH_PLATFORM_ID}"], [Default 3-letter platform identifier for 
version string])
+AC_DEFINE_UNQUOTED([DEFAULT_FLASH_SYSTEM_OS], ["${DEFAULT_FLASH_SYSTEM_OS}"], 
[Default value for System.capabilities.os])
+
+AC_SUBST(DEFAULT_FLASH_PLATFORM_ID)
+AC_SUBST(DEFAULT_FLASH_SYSTEM_OS)
+
+DEFAULT_STREAMS_TIMEOUT=10
+AC_SUBST(DEFAULT_STREAMS_TIMEOUT)
+AC_DEFINE_UNQUOTED([DEFAULT_STREAMS_TIMEOUT], [${DEFAULT_STREAMS_TIMEOUT}], 
[Default streams timeout in seconds])
+
 
 dnl Some things you can only do by looking at the platform name.
 case "${host}" in
@@ -1989,6 +2005,8 @@
 libmedia/Makefile
 po/Makefile
 libbase/Makefile
+libbase/sysgnashrc
+libbase/sysgnashpluginrc
 libgeometry/Makefile
 server/Makefile
 server/asobj/Makefile