[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac ChangeLog backend/render_han...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash configure.ac ChangeLog backend/render_han... |
|
Date: |
Tue, 10 Apr 2007 18:18:46 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/04/10 18:18:46
Modified files:
. : configure.ac ChangeLog
backend : render_handler_ogl.cpp
cygnal : netstats.cpp
gui : Makefile.am
server : StreamProvider.cpp StreamProvider.h
StringPredicates.h
server/parser : Makefile.am
server/vm : Makefile.am
server/asobj : Makefile.am
utilities : Makefile.am
macros : incllist libslist opengl.m4 x11.m4
Log message:
* configure.ac: Test the host to see if we're on a Darwin
machine.
* backend/render_handler_ogl.cpp: Build with the native Darwin
port of OpenGL.
* cygnal/netstats.cpp: Include date.hpp.
* gui/Makefile.am: Add FFMPEG_LIBS for cross compiling.
* macros/incllist, incllist: Don't search for Darwin specific
paths, we're correctly using the -framework flag to GCC now.
* macros/opengl.m4: For Darwin, use the OpenGL and AGL
frameworks
instead of include or linker paths.
* macros/x11.m4: Find all the right include paths. Look for
libXplugin too, which is Darwin specific, and in a weird place.
* server/StreamProvider.cpp: Remove bogus USE_CURL setting.
* server/StreamProvider.h: Include config.h.
* server/asobj/Makefile.am: Use FFMPEG_CFLAGS too.
* server/parser/Makefile.am: Use FFMPEG_CFLAGS too.
* server/vm/Makefile.am: Use FFMPEG_CFLAGS too.
* utilities/Makefile.am: Add FFMPEG_LIBS.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.289&r2=1.290
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2829&r2=1.2830
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/netstats.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StringPredicates.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.4&r2=1.5
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -b -r1.289 -r1.290
--- configure.ac 10 Apr 2007 15:48:39 -0000 1.289
+++ configure.ac 10 Apr 2007 18:18:45 -0000 1.290
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.289 2007/04/10 15:48:39 strk Exp $
+dnl $Id: configure.ac,v 1.290 2007/04/10 18:18:45 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -33,6 +33,9 @@
powerpc-apple-darwin*)
AC_DEFINE([__powerpc64__], [], [this is a 64 bit powerpc])
;;
+ i[34567]86-apple-darwin*)
+ darwin=yes
+ ;;
i[34567]86-*-openbsd*)
openbsd_os=openbsd
;;
@@ -312,29 +315,24 @@
dnl we have here now. For some reason on Darwin, we don't get the
dnl count from grep via stdin correctly. Writing a temp file does the
dnl trick, so although it's ugly, that's what we gotta do...
-dnl BOGUS dnl AC_MSG_CHECKING([Checking which type of library archiver we
have])
-dnl BOGUS dnl rm -f .tmp
-dnl BOGUS dnl libtool > .tmp 2>&1
-dnl BOGUS dnl archiver=`grep -c dynamic .tmp 2>&1`
-dnl BOGUS dnl rm -f .tmp
-dnl BOGUS dnl if test $archiver -eq 1; then
-dnl BOGUS dnl if test "$enable_shared" = no; then
-dnl BOGUS dnl AR="libtool -static"
-dnl BOGUS dnl else
-dnl BOGUS dnl AR="libtool -dynamic"
-dnl BOGUS dnl CXXFLAGS="${CXXFLAGS} -dynamic"
-dnl BOGUS dnl export MACOSX_DEPLOYMENT_TARGET="10.3"
-dnl BOGUS dnl fi
-dnl BOGUS dnl AR_FLAGS="-o"
-dnl BOGUS dnl darwin=yes
-dnl BOGUS dnl else
-dnl BOGUS dnl AR="ar"
-dnl BOGUS dnl AR_FLAGS="cvu"
-dnl BOGUS dnl darwin=no
-dnl BOGUS dnl fi
-dnl BOGUS dnl AC_MSG_RESULT([${AR}])
-dnl BOGUS dnl AC_SUBST(AR)
-dnl BOGUS dnl AC_SUBST(AR_FLAGS)
+AC_MSG_CHECKING([Checking which type of library archiver we have])
+rm -f .tmp
+libtool > .tmp 2>&1
+archiver=`grep -c dynamic .tmp 2>&1`
+rm -f .tmp
+if test $archiver -eq 1; then
+dnl if test "$enable_shared" = no; then
+dnl AR="libtool -static"
+dnl else
+dnl AR="libtool -dynamic"
+dnl CXXFLAGS="${CXXFLAGS} -dynamic"
+ export MACOSX_DEPLOYMENT_TARGET="10.3"
+dnl fi
+dnl AR_FLAGS="-o"
+ darwin=yes
+else
+ darwin=no
+fi
dnl When cross compiling, limit the search directories cause otherwise
dnl we may get the host headers or libraries by accident. These values
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2829
retrieving revision 1.2830
diff -u -b -r1.2829 -r1.2830
--- ChangeLog 10 Apr 2007 18:06:36 -0000 1.2829
+++ ChangeLog 10 Apr 2007 18:18:45 -0000 1.2830
@@ -1,3 +1,23 @@
+2007-04-10 Rob Savoye <address@hidden>
+
+ * configure.ac: Test the host to see if we're on a Darwin machine.
+ * backend/render_handler_ogl.cpp: Build with the native Darwin
+ port of OpenGL.
+ * cygnal/netstats.cpp: Include date.hpp.
+ * gui/Makefile.am: Add FFMPEG_LIBS for cross compiling.
+ * macros/incllist, incllist: Don't search for Darwin specific
+ paths, we're correctly using the -framework flag to GCC now.
+ * macros/opengl.m4: For Darwin, use the OpenGL and AGL frameworks
+ instead of include or linker paths.
+ * macros/x11.m4: Find all the right include paths. Look for
+ libXplugin too, which is Darwin specific, and in a weird place.
+ * server/StreamProvider.cpp: Remove bogus USE_CURL setting.
+ * server/StreamProvider.h: Include config.h.
+ * server/asobj/Makefile.am: Use FFMPEG_CFLAGS too.
+ * server/parser/Makefile.am: Use FFMPEG_CFLAGS too.
+ * server/vm/Makefile.am: Use FFMPEG_CFLAGS too.
+ * utilities/Makefile.am: Add FFMPEG_LIBS.
+
2007-04-10 Sandro Santilli <address@hidden>
* libbase/log.h: allow switching off any VERBOSITY overhead
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- backend/render_handler_ogl.cpp 7 Apr 2007 12:08:17 -0000 1.70
+++ backend/render_handler_ogl.cpp 10 Apr 2007 18:18:45 -0000 1.71
@@ -5,8 +5,14 @@
// A render_handler that uses SDL & OpenGL
+/* $Id: render_handler_ogl.cpp,v 1.71 2007/04/10 18:18:45 rsavoye Exp $ */
-/* $Id: render_handler_ogl.cpp,v 1.70 2007/04/07 12:08:17 nihilus Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cstring>
+#include <cmath>
//#include "gnash.h"
#include "render_handler.h"
@@ -14,15 +20,35 @@
#include "types.h"
#include "image.h"
#include "utility.h"
-#include "tu_opengl_includes.h"
-
-#include <cstring>
-#include <cmath>
#if defined(_WIN32) || defined(WIN32)
- #include <Windows.h>
+# include <Windows.h>
#endif
+#ifdef NOT_SGI_GL
+#include <AGL/agl.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#else
+# include <GL/gl.h>
+# include <GL/glx.h>
+# include <GL/glu.h>
+# ifndef APIENTRY
+# define APIENTRY
+# endif
+#endif
+
+#if !defined(WIN32) || defined(GUI_GTK)
+# define GL_GLEXT_PROTOTYPES
+# include <GL/gl.h>
+# include <GL/glx.h>
+# include <GL/glu.h>
+# ifndef APIENTRY
+# define APIENTRY
+# endif
+#endif // no WIN32 or OSX
+
using namespace gnash;
// choose the resampling method:
Index: cygnal/netstats.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/netstats.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cygnal/netstats.cpp 3 Jan 2007 01:52:06 -0000 1.2
+++ cygnal/netstats.cpp 10 Apr 2007 18:18:45 -0000 1.3
@@ -15,16 +15,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: netstats.cpp,v 1.2 2007/01/03 01:52:06 nihilus Exp $ */
+/* $Id: netstats.cpp,v 1.3 2007/04/10 18:18:45 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <boost/date_time/date.hpp>
#include "netstats.h"
#include "log.h"
using namespace gnash;
+using namespace boost::posix_time;
namespace cygnal {
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gui/Makefile.am 6 Apr 2007 07:58:15 -0000 1.63
+++ gui/Makefile.am 10 Apr 2007 18:18:45 -0000 1.64
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.63 2007/04/06 07:58:15 jgilmore Exp $
+# $Id: Makefile.am,v 1.64 2007/04/10 18:18:45 rsavoye Exp $
AUTOMAKE_OPTIONS =
localedir = $(datadir)/locale
@@ -63,6 +63,7 @@
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
$(LIBLTDL) \
+ $(FFMPEG_LIBS) \
$(CURL_LIBS) \
$(LIBXML_LIBS) \
$(BOOST_LIBS) \
@@ -123,7 +124,7 @@
if USE_GUI_GTK
AM_LDFLAGS += $(CAIRO_LIBS)
GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
- AM_LDFLAGS += $(GTK_LIBS)
+ AM_LDFLAGS += $(GTK_LIBS) $(X11_LIBS)
AM_CPPFLAGS += $(GTK_CFLAGS)
else
GTK_SRCS =
@@ -218,6 +219,7 @@
$(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/server/vm/libgnashvm.la \
+ $(top_builddir)/server/parser/libgnashparser.la \
$(top_builddir)/server/asobj/libgnashasobjs.la \
$(top_builddir)/server/parser/libgnashparser.la \
$(top_builddir)/libgeometry/libgnashgeo.la \
Index: server/StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/StreamProvider.cpp 24 Mar 2007 14:36:47 -0000 1.15
+++ server/StreamProvider.cpp 10 Apr 2007 18:18:45 -0000 1.16
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006. 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,18 +14,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-//
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-//#ifdef HAVE_CURL_CURL_H
-//#define USE_CURL 1
-//#endif
-
#include "StreamProvider.h"
#include "URL.h"
#include "tu_file.h"
Index: server/StreamProvider.h
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/StreamProvider.h 23 Feb 2007 11:26:54 -0000 1.3
+++ server/StreamProvider.h 10 Apr 2007 18:18:45 -0000 1.4
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -14,14 +14,14 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
#ifndef _GNASH_STREAMPROVIDER_H
#define _GNASH_STREAMPROVIDER_H
-#include <string>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <string>
// Forward declarations
class tu_file;
Index: server/StringPredicates.h
===================================================================
RCS file: /sources/gnash/gnash/server/StringPredicates.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/StringPredicates.h 27 Nov 2006 22:21:39 -0000 1.4
+++ server/StringPredicates.h 10 Apr 2007 18:18:45 -0000 1.5
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,11 +13,9 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-//
//
-/* $Id: StringPredicates.h,v 1.4 2006/11/27 22:21:39 nihilus Exp $ */
+/* $Id: StringPredicates.h,v 1.5 2007/04/10 18:18:45 rsavoye Exp $ */
#ifndef GNASH_STRINGPREDICATES_H
#define GNASH_STRINGPREDICATES_H
@@ -86,3 +84,8 @@
} // namespace gnash
#endif // GNASH_STRINGPREDICATES_H
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/Makefile.am 10 Apr 2007 14:41:12 -0000 1.27
+++ server/parser/Makefile.am 10 Apr 2007 18:18:45 -0000 1.28
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.27 2007/04/10 14:41:12 strk Exp $
+# $Id: Makefile.am,v 1.28 2007/04/10 18:18:45 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -38,6 +38,7 @@
-I$(top_srcdir) \
$(LIBXML_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(FFMPEG_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(DMALLOC_CFLAGS) \
Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/vm/Makefile.am 27 Mar 2007 14:52:05 -0000 1.8
+++ server/vm/Makefile.am 10 Apr 2007 18:18:45 -0000 1.9
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.8 2007/03/27 14:52:05 strk Exp $
+# $Id: Makefile.am,v 1.9 2007/04/10 18:18:45 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -32,6 +32,7 @@
-I$(top_srcdir)/libamf \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
+ $(FFMPEG_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(DMALLOC_CFLAGS) \
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/Makefile.am 28 Mar 2007 23:42:20 -0000 1.33
+++ server/asobj/Makefile.am 10 Apr 2007 18:18:46 -0000 1.34
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.33 2007/03/28 23:42:20 rsavoye Exp $
+# $Id: Makefile.am,v 1.34 2007/04/10 18:18:46 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -35,6 +35,7 @@
$(PTHREAD_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(FFMPEG_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(BOOST_CFLAGS) \
$(LIBXML_CFLAGS) \
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- utilities/Makefile.am 6 Apr 2007 07:58:16 -0000 1.51
+++ utilities/Makefile.am 10 Apr 2007 18:18:46 -0000 1.52
@@ -28,6 +28,8 @@
$(top_builddir)/server/asobj/libgnashasobjs.la \
$(top_builddir)/server/vm/libgnashvm.la \
$(top_builddir)/server/parser/libgnashparser.la \
+ $(top_builddir)/server/parser/libgnashparser.la \
+ $(top_builddir)/server/asobj/libgnashasobjs.la \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libamf/libgnashamf.la
@@ -38,6 +40,7 @@
$(LIBLTDL) \
$(MYSQL_LIBS) \
$(LIBXML_LIBS) \
+ $(FFMPEG_LIBS) \
$(CURL_LIBS) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
Index: macros/incllist
===================================================================
RCS file: /sources/gnash/gnash/macros/incllist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/incllist 8 Apr 2007 23:06:17 -0000 1.4
+++ macros/incllist 10 Apr 2007 18:18:46 -0000 1.5
@@ -1 +1 @@
-/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/include
/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${prefix}/${host_alias}/include
${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include
/pkg/include /opt/local/include /usr/local/include /home/latest/include
/opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include
/usr/include /usr/pkg/include /usr/local/olpc/include .. ../..
+${prefix}/${host_alias}/include ${prefix}/include /sw/include
/usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/mesa/include
/opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include
/usr/local/olpc/include .. ../..
Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/libslist 8 Apr 2007 23:06:17 -0000 1.6
+++ macros/libslist 10 Apr 2007 18:18:46 -0000 1.7
@@ -1 +1 @@
-/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib
/Developer/SDKs/MacOSX10.4*.sdk/usr/lib ${prefix}/${host_alias}/lib
${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64
/usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib
/home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib
/usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib /opt/mesa/lib64 .. ../..
+${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib
/usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib
/usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib
/usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib
/opt/mesa/lib64 .. ../..
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/opengl.m4 8 Apr 2007 23:06:17 -0000 1.30
+++ macros/opengl.m4 10 Apr 2007 18:18:46 -0000 1.31
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: opengl.m4,v 1.30 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.31 2007/04/10 18:18:46 rsavoye Exp $
AC_DEFUN([GNASH_PATH_OPENGL],
[
@@ -33,10 +33,19 @@
])
dnl If the include path hasn't been specified, go look for it.
+ if test x"${darwin}" = xyes; then
+ ac_cv_path_opengl_includes="-framework Carbon -framework
ApplicationServices -framework OpenGL -framework AGL
-I/System/Library/Frameworks/OpenGL.framework/Headers"
+ else
+ notsgigl=no
if test x"${ac_cv_path_opengl_includes}" = x; then
AC_MSG_CHECKING([for OpenGL headers])
- for i in $incllist; do
- if test -f $i/GL/gl.h; then
+ newlist="/System/Library/Frameworks/OpenGL.framework/Headers
${incllist}"
+ for i in $newlist; do
+ if test -f $i/GL/gl.h -o -f $i/OpenGL.h; then
+ if test -f $i/OpenGL.h; then
+ notsgigl=yes
+ AC_DEFINE(NOT_SGI_GL, [1], [Is not based on the SGI GL])
+ fi
if test x"$i" != x"/usr/include"; then
ac_cv_path_opengl_includes="-I$i"
break
@@ -50,6 +59,7 @@
fi
done
fi
+ fi
if test x"${ac_cv_path_opengl_includes}" = x; then
AC_CHECK_HEADERS([GL/gl.h], [ac_cv_path_opengl_includes=""])
@@ -77,8 +87,12 @@
fi
])
+ if test x"${darwin}" = xyes; then
+ ac_cv_path_opengl_lib="framework Carbon -framework ApplicationServices
-framework OpenGL -framework AGL"
+ else
if test x"${ac_cv_path_opengl_lib}" = x; then
- for i in $libslist; do
+ newlist="/System/Library/Frameworks/OpenGL.framework/Libraries
${libslist}"
+ for i in $newlist; do
if test -f $i/libGL.${shlibext} -o -f $i/libGL.a; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_opengl_lib="-L$i -lGL"
@@ -104,6 +118,7 @@
done
fi
fi dnl end of if ac_cv_path_opengl_lib
+ fi dnl end of if darwin
fi dnl end of if $opengl
if test x"${ac_cv_path_opengl_lib}" = x; then
Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/x11.m4 8 Apr 2007 23:06:17 -0000 1.4
+++ macros/x11.m4 10 Apr 2007 18:18:46 -0000 1.5
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: x11.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: x11.m4,v 1.5 2007/04/10 18:18:46 rsavoye Exp $
AC_DEFUN([GNASH_PATH_X11],
[
@@ -42,7 +42,8 @@
dnl If the path hasn't been specified, go look for it.
if test x"${ac_cv_path_x11_incl}" = x; then
AC_MSG_CHECKING([for X11 headers])
- for i in $incllist; do
+ newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${incllist}"
+ for i in $newlist; do
if test -f $i/X11/X.h; then
if test x"$i" != x"/usr/include"; then
ac_cv_path_x11_incl="-I$i"
@@ -84,23 +85,29 @@
dnl If the header doesn't exist, there is no point looking for the library.
if test x"${ac_cv_path_x11_incl}" != x; then
AC_MSG_CHECKING([for X11 library])
- for i in $libslist; do
+ newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/lib
/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
+ for i in $newlist; do
if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
+ ac_cv_path_x11_lib="-L$i -lX11"
if test -f $i/libXinerama.a -o -f $i/libXinerama.${shlibext}; then
- ac_cv_path_x11_lib="-lXinerama"
+ ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXinerama"
fi
- if test x"$i" != x"/usr/lib"; then
- ac_cv_path_x11_lib="-L$i -lX11 ${ac_cv_path_x11_lib}"
- break
- else
- ac_cv_path_x11_lib="-lX11 ${ac_cv_path_x11_lib}"
- break
+ if test -f $i/libXext.a -o -f $i/libXext.${shlibext}; then
+ ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXext"
fi
AC_MSG_RESULT(yes)
+ break
fi
done
fi
+ for i in $newlist; do
+ if test -f $i/libXplugin.a -o -f $i/libXplugin.${shlibext}; then
+ ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -L$i -lXplugin"
+ break
+ fi
+ done
+
if test x"${ac_cv_path_x11_lib}" = x; then
AC_CHECK_LIB(X11, x11_mem_init, [ac_cv_path_x11_lib=""])
AC_MSG_RESULT(${ac_cv_path_x11_lib})
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash configure.ac ChangeLog backend/render_han...,
Rob Savoye <=