CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/27 03:28:56
Modified files:
. : ChangeLog configure.ac
Log message:
* configure.ac: Don't threat static linking specially, multiple
GUIs can still be supported by that.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3840&r2=1.3841
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.370&r2=1.371
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3840
retrieving revision 1.3841
diff -u -b -r1.3840 -r1.3841
--- ChangeLog 26 Jul 2007 22:07:27 -0000 1.3840
+++ ChangeLog 27 Jul 2007 03:28:56 -0000 1.3841
@@ -1,5 +1,10 @@
2007-07-26 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac: Don't threat static linking specially, multiple
+ GUIs can still be supported by that.
+
+2007-07-26 Sandro Santilli <[EMAIL PROTECTED]>
+
* configure.ac: don't assume that if GTK gui is used only the
GTK-pixelformat is needed (other GUIs might be built).
Fixes bug #20586.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -b -r1.370 -r1.371
--- configure.ac 26 Jul 2007 22:07:28 -0000 1.370
+++ configure.ac 27 Jul 2007 03:28:56 -0000 1.371
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.370 2007/07/26 22:07:28 strk Exp $
+dnl $Id: configure.ac,v 1.371 2007/07/27 03:28:56 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -540,8 +540,11 @@
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 build a statically linked executable
-if test x"${enable_shared}" = xno; then
+dnl We don't have anything special to do in this case
+if false; then # test x"${enable_shared}" = xno; then
+
g=`echo $addgui | grep -c '\,'`
r=`echo $add_renderer | grep -c '\,'`
if test $g -gt 0 -o $r -gt 0 ; then
@@ -561,7 +564,9 @@
add_renderer=ogl
AC_MSG_NOTICE([Defaulting to OpenGL as the renderer, use
--enable-renderer= to change])
fi
+
else dnl building a dynamically linked executable without loadable GUI plugins
+
dnl If not dynamic loading, and no gui is specified, force gtk
if test x"${dynamic_gui}" = xno; then
if test x$addgui = xnone; then
@@ -593,6 +598,7 @@
AC_MSG_NOTICE([Defaulting to OpenGL and AGG as the renderers, use
--enable-renderer= to change])
fi
fi
+
fi
AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes ])
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
