[Gnash-commit] gnash ChangeLog configure.ac [release_0_7_2]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Sandro Santilli <strk>  06/11/08 09:16:33

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        * configure.ac: move the AC_DEFINE([GUI_*]) calls *after* the possible 
fallback to SDL (see bug #15540)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.114&r2=1.1412.2.115
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.186.2.16&r2=1.186.2.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.114
retrieving revision 1.1412.2.115
diff -u -b -r1.1412.2.114 -r1.1412.2.115
--- ChangeLog   8 Nov 2006 09:06:49 -0000       1.1412.2.114
+++ ChangeLog   8 Nov 2006 09:16:33 -0000       1.1412.2.115
@@ -1,5 +1,7 @@
 2006-11-08 Sandro Santilli <address@hidden>
 
+       * configure.ac: move the AC_DEFINE([GUI_*]) calls *after*
+         the possible fallback to SDL (see bug #15540)
        * gui/Player.cpp: don't issue a warning if RENDER_OPENGL is
          defined and HAVE_GTK_GTKGL_H is not unless the selected
          gui is GTK (it would be safe for SDL gui).

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.186.2.16
retrieving revision 1.186.2.17
diff -u -b -r1.186.2.16 -r1.186.2.17
--- configure.ac        6 Nov 2006 16:44:51 -0000       1.186.2.16
+++ configure.ac        8 Nov 2006 09:16:33 -0000       1.186.2.17
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.186.2.16 2006/11/06 16:44:51 strk Exp $
+dnl $Id: configure.ac,v 1.186.2.17 2006/11/08 09:16:33 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.2)
@@ -140,12 +140,6 @@
   esac],
  [gui=gtk]
 )
-case "${gui}" in
-       gtk)  AC_DEFINE([GUI_GTK],  [1], [Use GTK gui toolkit]) ;;
-       sdl)  AC_DEFINE([GUI_SDL],  [1], [Use SDL gui toolkit]) ;;
-       fb) AC_DEFINE([GUI_FB], [1], [Use Framebuffer, no gui toolkit]) ;;
-       *)
-esac
 
 AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
 AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
@@ -549,6 +543,13 @@
 AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
 AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
 
+case "${gui}" in
+       gtk)  AC_DEFINE([GUI_GTK],  [1], [Use GTK gui toolkit]) ;;
+       sdl)  AC_DEFINE([GUI_SDL],  [1], [Use SDL gui toolkit]) ;;
+       fb) AC_DEFINE([GUI_FB], [1], [Use Framebuffer, no gui toolkit]) ;;
+       *)
+esac
+
 if test x"$mp3_decoder" = x"ffmpeg"; then
        GNASH_PATH_FFMPEG
        if test x"${ac_cv_path_ffmpeg_lib}" = x ; then