[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/29 07:41:02

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        always look for X11 libs, even if build_fb is set
        (may be just one of the guis, not the only one)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5009&r2=1.5010
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.450&r2=1.451

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5009
retrieving revision 1.5010
diff -u -b -r1.5009 -r1.5010
--- ChangeLog   29 Nov 2007 07:22:35 -0000      1.5009
+++ ChangeLog   29 Nov 2007 07:41:01 -0000      1.5010
@@ -1,5 +1,7 @@
 2007-11-29 Sandro Santilli <address@hidden>
 
+       * configure.in: always look for X11 libs, even if build_fb is set (may 
be just
+         one of the guis, not the only one)
        * gui/am-frag/qtopia.am: don't append to CXXFLAGS before it's
          set.
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -b -r1.450 -r1.451
--- configure.ac        29 Nov 2007 05:21:06 -0000      1.450
+++ configure.ac        29 Nov 2007 07:41:02 -0000      1.451
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.450 2007/11/29 05:21:06 rsavoye Exp $
+dnl $Id: configure.ac,v 1.451 2007/11/29 07:41:02 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -890,15 +890,16 @@
 AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, 1, [Has log2()]))
 AC_CHECK_LIB(m, trunc, AC_DEFINE(HAVE_TRUNC, 1, [Has trunc()]))
 
-dnl don't look for X11 when using a raw framebuffer for the GUI
-if ! test x$build_fb = xyes; then
+dnl X11 is needed for fltk (at least),
+dnl and probably for many other guis too ...
+dnl if ! test x$build_fb = xyes; then # <--- this is wrong as build_x is 
non-exclusive
 dnl AC_PATH_XTRA
 dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
 dnl AC_CHECK_LIB(gmp, _gmp_get_memory_functions)
   GNASH_PATH_X11
   AC_CHECK_LIB(Xi, XInput_find_display)
   AC_CHECK_LIB(X11, XDisableAccessControl)
-fi
+dnl fi
 AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
 
 AC_CHECK_LIB(rt, shm_unlink)