CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/31 21:59:50
Modified files:
. : ChangeLog configure.ac
gui : Makefile.am
Log message:
* configure.ac, gui/Makefile.am: comment out
--enable-dynamic-gui
and related conditionals use.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3891&r2=1.3892
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.387&r2=1.388
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.97&r2=1.98
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3891
retrieving revision 1.3892
diff -u -b -r1.3891 -r1.3892
--- ChangeLog 31 Jul 2007 20:42:06 -0000 1.3891
+++ ChangeLog 31 Jul 2007 21:59:49 -0000 1.3892
@@ -1,5 +1,10 @@
2007-07-31 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac, gui/Makefile.am: comment out --enable-dynamic-gui
+ and related conditionals use.
+
+2007-07-31 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/actionscript.all/array.as: more tests for Array.sort()
and Array.sortOn(). These tests are mainly to explore the behavior
of sorting arrays of objects that override the toString() method and
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -b -r1.387 -r1.388
--- configure.ac 31 Jul 2007 19:29:42 -0000 1.387
+++ configure.ac 31 Jul 2007 21:59:49 -0000 1.388
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.387 2007/07/31 19:29:42 strk Exp $
+dnl $Id: configure.ac,v 1.388 2007/07/31 21:59:49 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -157,20 +157,20 @@
fi
AM_CONDITIONAL(MENUS, test x$menus = xyes)
-dnl Enable building the gui support even when statically
-dnl linking. Normally this is only disabled when building a statically
-dnl linked gnash executable.
-AC_ARG_ENABLE(dynamic-gui,
- AC_HELP_STRING([--enable-dynamic-gui],[Enable building dynamically loadable
GUIs and renderers ]),
-[case "${enableval}" in
- yes) dynamic_gui=yes ;;
- no) dynamic_gui=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-dynamic-gui option])
;;
-esac],dynamic_gui=no)
-if test x"${dynamic_gui}" = x"yes"; then
- AC_DEFINE([USE_DYNAMIC_GUI], [], [Dynamically loadable GUI and renderer
support])
-fi
-AM_CONDITIONAL(DYNAMIC_GUI, test x${dynamic_gui} = xyes)
+dnl -- dnl Enable building the gui support even when statically
+dnl -- dnl linking. Normally this is only disabled when building a statically
+dnl -- dnl linked gnash executable.
+dnl -- AC_ARG_ENABLE(dynamic-gui,
+dnl -- AC_HELP_STRING([--enable-dynamic-gui],[Enable building dynamically
loadable GUIs and renderers ]),
+dnl -- [case "${enableval}" in
+dnl -- yes) dynamic_gui=yes ;;
+dnl -- no) dynamic_gui=no ;;
+dnl -- *) AC_MSG_ERROR([bad value ${enableval} for --enable-dynamic-gui
option]) ;;
+dnl -- esac],dynamic_gui=no)
+dnl -- if test x"${dynamic_gui}" = x"yes"; then
+dnl -- AC_DEFINE([USE_DYNAMIC_GUI], [], [Dynamically loadable GUI and
renderer support])
+dnl -- fi
+dnl -- AM_CONDITIONAL(DYNAMIC_GUI, test x${dynamic_gui} = xyes)
dnl Write the file to disk in the plugin, if specified.
AC_ARG_ENABLE(write,
@@ -549,7 +549,7 @@
AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
-AM_CONDITIONAL(STATIC_GUI, test x"${dynamic_gui}" = xno -o x"${enable_shared}"
= xno)
+dnl -- AM_CONDITIONAL(STATIC_GUI, test x"${dynamic_gui}" = xno -o
x"${enable_shared}" = xno)
AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes ])
AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg = xyes ])
@@ -1369,11 +1369,11 @@
echo " Konqueror plugin disabled."
fi
-if test x"${dynamic_gui}" = x"yes"; then
- echo " Loadable GUI & renderer enabled."
-else
- echo " Loadable GUI & renderer disabled (default). Use
--enable-dynamic-gui to enable."
-fi
+dnl -- if test x"${dynamic_gui}" = x"yes"; then
+dnl -- echo " Loadable GUI & renderer enabled."
+dnl -- else
+dnl -- echo " Loadable GUI & renderer disabled (default). Use
--enable-dynamic-gui to enable."
+dnl -- fi
if test x"$ghelp" = x"yes"; then
echo " GNOME help enabled"
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- gui/Makefile.am 31 Jul 2007 19:42:36 -0000 1.97
+++ gui/Makefile.am 31 Jul 2007 21:59:49 -0000 1.98
@@ -89,15 +89,15 @@
$(MYSQL_LIBS)
# Only build loadable modules unless statically linking
-if DYNAMIC_GUI # make shared libraries suitable for dlopen().
-if ENABLE_SHARED
- LIB_FLAGS = -module -avoid-version -no-undefined
-else
- LIB_FLAGS = -release $(VERSION)
-endif # ENABLE_SHARED
-else # make shared libraries suitable for linking.
- LIB_FLAGS = -release $(VERSION)
-endif # DYNAMIC_GUI
+# if DYNAMIC_GUI # make shared libraries suitable for dlopen().
+# if ENABLE_SHARED
+# LIB_FLAGS = -module -avoid-version -no-undefined
+# else
+# LIB_FLAGS = -release $(VERSION)
+# endif # ENABLE_SHARED
+# else # make shared libraries suitable for linking.
+# LIB_FLAGS = -release $(VERSION)
+# endif # DYNAMIC_GUI
# AQUA Toolkit
if BUILD_AQUA_GUI
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
