[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash backend/Makefile.am libbase/Makefile.am m...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash backend/Makefile.am libbase/Makefile.am m... |
|
Date: |
Wed, 16 May 2007 15:58:22 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/05/16 15:58:22
Modified files:
backend : Makefile.am
libbase : Makefile.am
macros : boost.m4 libltdl.m4
gui : Makefile.am
. : configure.ac ChangeLog
Log message:
* configure.ac: Eval lists so the embedded variables get
expanded on all systems. Turn on --as-needed for all
builds. Define LIBLTDL variables and DLOPEN again.
* backend/Makefile.am: Don't use no-undefined -export-dynamic
for
a library.
* libbase/Makefile.am: Build standalone libltdl now so we can
work
with an installed one too, which appears to be necessary on 64
bit
systems.
* macros/boost.m4: Rewrite to support Boost 3.4, which of course
changed the library names. Get all libraries with of the right
type, and sort through the variants to choose the correct one,
preferably ending in *-mt.so.
* macros/kde.m4: Define newlist, so we don't stomp the value of
libslist, which produces bizarre side effects when cross
compiling.
* macros/libltdl.m4: Our build of libltdl.la lives in libbase
instead of libltdl. NOTE: This will unfortunately have to be
done
again if this file is updated in the future from the version
included on libtool.
* gui/Makefile.am: -framework Carbon should be defined in
$OPENGL_LIBS.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libltdl.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.310&r2=1.311
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3238&r2=1.3239
Patches:
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- backend/Makefile.am 27 Apr 2007 01:08:50 -0000 1.53
+++ backend/Makefile.am 16 May 2007 15:58:21 -0000 1.54
@@ -125,7 +125,7 @@
$(RENDER_SOURCES) \
$(SOUND_SOURCES)
-libgnashbackend_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashbackend_la_LDFLAGS = -release $(VERSION)
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- libbase/Makefile.am 15 May 2007 16:31:02 -0000 1.65
+++ libbase/Makefile.am 16 May 2007 15:58:21 -0000 1.66
@@ -21,12 +21,13 @@
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
-lib_LTLIBRARIES = libgnashbase.la
+lib_LTLIBRARIES = libltdl.la libgnashbase.la
+
+libltdl_la_CPPFLAGS = $(LTDLINCL)
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-I.. -I$(srcdir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/libltdl \
-I$(top_srcdir)/libamf \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/swf \
@@ -41,7 +42,6 @@
$(Z_CFLAGS) \
$(JPEG_CFLAGS) \
$(BOOST_CFLAGS) \
- $(INCLTDL) \
$(NULL)
# These headers get installed
@@ -70,6 +70,8 @@
EXTRA_DIST += tu_file_SDL.cpp
endif
+libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+
libgnashbase_la_SOURCES = \
config.cpp \
container.cpp \
@@ -141,10 +143,6 @@
FLVParser.h
-# add libltdl
-libgnashbase_la_SOURCES += $(top_srcdir)/libltdl/ltdl.c
-noinst_HEADERS += $(top_srcdir)/libltdl/ltdl.h
-
if USE_SOUND_GST
libgnashbase_la_SOURCES += gstgnashsrc.c embedVideoDecoderGst.cpp
noinst_HEADERS += gstgnashsrc.h embedVideoDecoderGst.h
@@ -160,6 +158,7 @@
endif
libgnashbase_la_LDFLAGS = -release $(VERSION)
+libltdl_la_LDFLAGS = -release $(VERSION)
# We use our own rule to build the demo so it isn't built by default.
# Since it doesn't contain a main() routine, we only try to compile,
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- macros/boost.m4 13 May 2007 19:26:30 -0000 1.43
+++ macros/boost.m4 16 May 2007 15:58:21 -0000 1.44
@@ -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: boost.m4,v 1.43 2007/05/13 19:26:30 strk Exp $
+dnl $Id: boost.m4,v 1.44 2007/05/16 15:58:21 rsavoye Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -49,14 +49,19 @@
gnash_boost_version=""
for i in $incllist; do
for j in `ls -dr $i/boost* 2>/dev/null`; do
+ if test -f ${j}/boost/detail/lightweight_mutex.hpp; then
+ gnash_boost_topdir=`basename $j`
+ ac_cv_path_boost_incl="-I${j}"
+ break
+ fi
if test -f ${j}/detail/lightweight_mutex.hpp; then
gnash_boost_topdir=`basename $j`
- gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e
's:boost-::'`
- ac_cv_path_boost_incl="-I$i"
+ ac_cv_path_boost_incl="-I${i}"
break
fi
done
- if test x$gnash_boost_version != x; then
+ if test x$gnash_boost_topdir != x; then
+ gnash_boost_version=`echo ${gnash_boost_topdir} | sed -e 's:boost-::'`
break;
fi
done
@@ -93,31 +98,84 @@
dnl version compiled with GCC instead of the native
dnl compiler. Finally look for the library without any qualitfying
dnl attributes.
- boost_datenames="boost_date_time-gcc-mt boost_date_time-mt
boost_date_time-gcc boost_date_time-mt boost_date_time"
- boost_threadnames="boost_thread-gcc-mt boost_thread-mt boost_thread
boost_thread-gcc"
- boost_date_time=no
- boost_thread=no
+ boost_date_time="no"
+ boost_thread="no"
AC_MSG_CHECKING([for Boost libraries])
for i in $libslist; do
if test x${boost_date_time} = xyes && test x${boost_thread} = xyes; then
break;
fi
- for libname in ${boost_datenames}; do
- # ${shlibext}* allows .so to work where .so symlink is not installed
(the * has been removed for now to fix detection on normal systems)
- if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
+ dirs=`ls -dr $i/libboost_date_time*.${shlibext} $i/libboost_date_time*.a
2>/dev/null`
+ for libname in $dirs; do
+ if test x"${boost_date_time}" = xno; then
+ lfile=`basename ${libname} | eval sed -e 's:^lib::' -e
's:\.${shlibext}.*::'`
+ ldir=`dirname ${libname}`
+ if test -f ${ldir}/lib${lfile}-mt.${shlibext}; then
+ lfile="${lfile}-mt"
+ fi
boost_date_time=yes
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${libname}"
- break;
+ ac_cv_path_boost_lib="-L${ldir} -l${lfile}"
+ break
+ else
+ break
fi
done
- for libname in ${boost_threadnames}; do
- # ${shlibext}* allows .so to work where .so symlink is not installed
(the * has been removed for now to fix detection on normal systems)
- if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
+
+ dnl now look for the Boost Thread library
+ dirs=`ls -dr $i/libboost_thread*.${shlibext} $i/libboost_thread*.a
2>/dev/null`
+ for libname in $dirs; do
+ if test x"${boost_thread}" = xno; then
+ lfile=`basename ${libname} | eval sed -e 's:^lib::' -e
's:\.${shlibext}.*::'`
+ ldir=`dirname ${libname}`
+ if test -f ${ldir}/lib${lfile}-mt.${shlibext}; then
+ lfile=${lfile}-mt
+ fi
boost_thread=yes
- ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${libname}"
- break;
+ ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+ break
+ else
+ break
fi
done
+
+dnl for libname in `eval ls -dr $i/libboost_thread* 2>/dev/null`; do
+dnl # ${shlibext}* allows .so to work where .so symlink is not installed
(the *
+dnl # has been removed for now to fix detection on normal systems)
+dnl if test x"${boost_thread}" = xno; then
+dnl lfile=`basename ${libname} | eval sed -e 's:^lib::' -e
's:\.${shlibext}.*::'`
+dnl ldir=`dirname ${libname}`
+dnl case "${libname}" in
+dnl *-mt-${gnash_boost_version}.${shlibext})
+dnl boost_thread=yes
+dnl ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+dnl echo "FIXME: ${libname} shared lib with version"
+dnl ;;
+dnl *-mt-${gnash_boost_version}.a)
+dnl boost_thread=yes
+dnl ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+dnl echo "FIXME: ${libname} static lib with version"
+dnl ;;
+dnl *-mt.${shlibext})
+dnl boost_thread=yes
+dnl ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+
+dnl echo "FIXME: ${libname} shared lib without version"
+dnl ;;
+dnl *-mt.a)
+dnl boost_thread=yes
+dnl ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+dnl echo "FIXME: ${libname} static lib without version"
+dnl ;;
+dnl *-mt.${shlibext}*)
+dnl boost_thread=yes
+dnl ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${lfile}"
+dnl echo "FIXME: ${libname} shared lib doesn't end with .so"
+dnl ;;
+dnl esac
+dnl else
+dnl break
+dnl fi
+dnl done
done
AC_MSG_RESULT(${ac_cv_path_boost_lib})
Index: macros/libltdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libltdl.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/libltdl.m4 15 May 2007 16:31:02 -0000 1.1
+++ macros/libltdl.m4 16 May 2007 15:58:21 -0000 1.2
@@ -2542,7 +2542,7 @@
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libbase'])/libltdlc.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
@@ -2573,7 +2573,7 @@
])
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libbase'])/libltdl.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
@@ -6465,7 +6465,7 @@
AC_MSG_CHECKING([whether to use included libltdl])
AC_MSG_RESULT([$with_included_ltdl])
-AC_CONFIG_SUBDIRS([libltdl])
+dnl AC_CONFIG_SUBDIRS([libltdl])
])# AC_WITH_LTDL
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- gui/Makefile.am 16 May 2007 07:14:00 -0000 1.73
+++ gui/Makefile.am 16 May 2007 15:58:22 -0000 1.74
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.73 2007/05/16 07:14:00 strk Exp $
+# $Id: Makefile.am,v 1.74 2007/05/16 15:58:22 rsavoye Exp $
AUTOMAKE_OPTIONS =
localedir = $(datadir)/locale
@@ -36,7 +36,8 @@
$(SDL_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS)
+ $(PTHREAD_CFLAGS) \
+ $(NULL)
GTK_CFLAGS = \
$(GTK2_CFLAGS) \
@@ -66,6 +67,7 @@
$(FFMPEG_LIBS) \
$(CURL_LIBS) \
$(LIBXML_LIBS) \
+ $(INCLTDL) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(NULL)
@@ -80,7 +82,7 @@
endif # USE_GUI_GTK
if USE_GUI_AQUA
AQUA_OPENGL_SRCS = aqua_ogl_glue.cpp aqua_ogl_glue.h
- AM_LDFLAGS += -framework Carbon $(OPENGL_LIBS)
+ AM_LDFLAGS += $(OPENGL_LIBS)
endif # USE_GUI_AQUA
if USE_GUI_SDL
SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
@@ -257,7 +259,7 @@
gnash_SOURCES = gnash.cpp
# export our symbols so they can be used by Gnash plugins
-gnash_LDFLAGS = -no-undefined -export-dynamic
+gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
gnash_DEPENDENCIES = $(GNASH_LIBS)
gnash_LDADD = \
$(MYSQL_LIBS) \
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -b -r1.310 -r1.311
--- configure.ac 15 May 2007 16:31:00 -0000 1.310
+++ configure.ac 16 May 2007 15:58:22 -0000 1.311
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.310 2007/05/15 16:31:00 rsavoye Exp $
+dnl $Id: configure.ac,v 1.311 2007/05/16 15:58:22 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -425,18 +425,20 @@
if test x$cross_compiling = xyes; then
AC_MSG_NOTICE([Configuring Gnash for cross compilation])
export pkgroot=`$CXX -print-search-dirs | grep "install:" | sed -e
's/install: //' -e 's:/lib/gcc/.*::'`
- export incllist="${with_top_level}/include ${pkgroot}/${host_alias}/include
${pkgroot}/include"
- export libslist="${with_top_level}/lib ${pkgroot}/${host_alias}/lib
${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib"
- export pathlist="${pkgroot}/${host_alias}/bin:${pkgroot}/bin"
- LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+ export incllist=`eval echo ${with_top_level}/include
${pkgroot}/${host_alias}/include ${pkgroot}/include`
+ export libslist=`eval echo ${with_top_level}/lib
${pkgroot}/${host_alias}/lib ${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib`
+ export pathlist=`eval echo ${pkgroot}/${host_alias}/bin:${pkgroot}/bin`
plugin=no
else
AC_MSG_NOTICE([Configuring Gnash for native compilation])
- export incllist=`cat ${srcdir}/macros/incllist`
- export libslist=`cat ${srcdir}/macros/libslist`
+ export incllist=`eval cat ${srcdir}/macros/incllist`
+ export libslist=`eval cat ${srcdir}/macros/libslist`
export pathlist=$PATH
fi
+dnl Try to ignore stupid dependencies
+LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+
dnl GNASH_PKG_FIND(dmalloc, [dmalloc.h], [dmalloc], mallinfo)
AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
@@ -894,15 +896,15 @@
dnl AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has
lt_dlmutex_register]),
dnl AC_DEFINE(LT_DLMUTEX, 0, [doesn't
have lt_dlmutex_register]) )
-dnl DLOPEN="-dlopen"
-dnl DLPREOPEN="-dlpreopen"
-dnl AC_SUBST(DLOPEN)
-dnl AC_SUBST(DLPREOPEN)
+DLOPEN="-dlopen"
+DLPREOPEN="-dlpreopen"
+AC_SUBST(DLOPEN)
+AC_SUBST(DLPREOPEN)
dnl dnl Substitute INCLTDL and LIBLTDL in the Makefiles
-dnl AC_SUBST(INCLTDL)
-dnl AC_SUBST(LIBLTDL)
-dnl AC_SUBST(LIBTOOL_DEPS)
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(LIBTOOL_DEPS)
dnl Define winsock if we're on windows. We could do something complicated,
dnl but since AC_EXEEXT does it for us, we'll do this the easy way.
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3238
retrieving revision 1.3239
diff -u -b -r1.3238 -r1.3239
--- ChangeLog 16 May 2007 12:50:26 -0000 1.3238
+++ ChangeLog 16 May 2007 15:58:22 -0000 1.3239
@@ -1,3 +1,27 @@
+2007-05-16 Rob Savoye <address@hidden>
+
+ * configure.ac: Eval lists so the embedded variables get
+ expanded on all systems. Turn on --as-needed for all
+ builds. Define LIBLTDL variables and DLOPEN again.
+ * backend/Makefile.am: Don't use no-undefined -export-dynamic for
+ a library.
+ * libbase/Makefile.am: Build standalone libltdl now so we can work
+ with an installed one too, which appears to be necessary on 64 bit
+ systems.
+ * macros/boost.m4: Rewrite to support Boost 3.4, which of course
+ changed the library names. Get all libraries with of the right
+ type, and sort through the variants to choose the correct one,
+ preferably ending in *-mt.so.
+ * macros/kde.m4: Define newlist, so we don't stomp the value of
+ libslist, which produces bizarre side effects when cross
+ compiling.
+ * macros/libltdl.m4: Our build of libltdl.la lives in libbase
+ instead of libltdl. NOTE: This will unfortunately have to be done
+ again if this file is updated in the future from the version
+ included on libtool.
+ * gui/Makefile.am: -framework Carbon should be defined in
+ $OPENGL_LIBS.
+
2007-05-16 Sandro Santilli <address@hidden>
* server/asobj/NetStreamGst.{cpp,h}: define and use
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash backend/Makefile.am libbase/Makefile.am m...,
Rob Savoye <=