[Gnash-commit] gnash ChangeLog configure.ac

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/05/06 22:57:35

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        added aqua to --enable-gui

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3112&r2=1.3113
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.301&r2=1.302

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3112
retrieving revision 1.3113
diff -u -b -r1.3112 -r1.3113
--- ChangeLog   6 May 2007 20:03:55 -0000       1.3112
+++ ChangeLog   6 May 2007 22:57:34 -0000       1.3113
@@ -1,3 +1,7 @@
+2007-05-07 Markus Gothe <address@hidden>
+
+       * configure.ac, gui/aqua*: Added aqua/carbon-stubs.
+
 2007-05-06 Tomas Groth Christensen <address@hidden>
 
        * libbase/LoadThread.cpp: Delete the thread after use so we don't

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -b -r1.301 -r1.302
--- configure.ac        4 May 2007 17:05:37 -0000       1.301
+++ configure.ac        6 May 2007 22:57:35 -0000       1.302
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.301 2007/05/04 17:05:37 strk Exp $
+dnl $Id: configure.ac,v 1.302 2007/05/06 22:57:35 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -173,10 +173,11 @@
 esac],klash=yes)
 
 AC_ARG_ENABLE(gui,
-  AC_HELP_STRING([--enable-gui=TOOLKIT], [Specify GUI toolkit: GTK, FLTK, 
RISCOS, FB (framebuffer), KDE or SDL[[GTK]] ]),
+  AC_HELP_STRING([--enable-gui=TOOLKIT], [Specify GUI toolkit: GTK, FLTK, 
RISCOS, AQUA (OS X), FB (framebuffer), KDE or SDL[[GTK]] ]),
  [case "${enableval}" in
    gtk|GTK) gui=gtk ;;
    sdl|SDL) gui=sdl  ;;
+   aqua|AQUA) gui=aqua  ;;
    kde|KDE) gui=kde  ;;
    fb|FB) gui=fb  ;;
    fltk|FLTK) gui=fltk  ;;
@@ -775,6 +776,7 @@
 AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
 AM_CONDITIONAL(USE_GUI_GTK, test x$gui = xgtk)
 AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
+AM_CONDITIONAL(USE_GUI_AQUA, test x$gui = xaqua)
 AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
 AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
 AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
@@ -783,6 +785,7 @@
 case "${gui}" in
   gtk)  AC_DEFINE([GUI_GTK],  [1], [Use GTK gui toolkit]) ;;
   sdl)  AC_DEFINE([GUI_SDL],  [1], [Use SDL gui toolkit]) ;;
+  aqua)  AC_DEFINE([GUI_AQUA],[1], [Use AQUA (OS X) gui toolkit]) ;;
   kde)  AC_DEFINE([GUI_KDE],  [1], [Use KDE gui toolkit]) ;;
   fltk) AC_DEFINE([GUI_FLTK], [1], [Use FLTK gui toolkit]) ;;
   fb) AC_DEFINE([GUI_FB], [1], [Use Framebuffer, no gui toolkit]) ;;