[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. f4bfb36984347440f57c
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. f4bfb36984347440f57cc3941c45346f9e9aab9e |
|
Date: |
Thu, 09 Dec 2010 22:37:35 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via f4bfb36984347440f57cc3941c45346f9e9aab9e (commit)
via 72e27bb000a46cd4b20652f6a78aa340f29458a2 (commit)
via a736d0bfe036f7a23312bb7cf12d4b2e0262b245 (commit)
via 8996f4b2cbfa06022a95caf737ad87003d4e7834 (commit)
via b3d1c56c9c390733ab56666f13ceaf49829bc1d0 (commit)
via 1794408ecb223bd08feaf9001c7f43d952a5645b (commit)
via b8403eaa2605fc5510712eccf76fae7e1f185b62 (commit)
via ecf67826be637589682821a30dc2daa5a3c01b59 (commit)
via 9c465f515be5bc0783d153aba87c2959e9a0fca6 (commit)
via 0e36a799eeda2e3367d90c9549c304159368fe43 (commit)
via 035f20d7e32520e2d82b6528810815f205e26df5 (commit)
via 7577e65e431f3fed179ec679578b003a2cd5e168 (commit)
via f4e65b5b1ec20a857880ae7f60a3af0b3f259d1c (commit)
via 7d7175dfa8c7c228fce2ac829ae86c63b42c435d (commit)
from aa12e91694ec94b58b2a1c208a8de95ec17c24b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f4bfb36984347440f57cc3941c45346f9e9aab9e
commit f4bfb36984347440f57cc3941c45346f9e9aab9e
Merge: 72e27bb aa12e91
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 15:36:56 2010 -0700
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=72e27bb000a46cd4b20652f6a78aa340f29458a2
commit 72e27bb000a46cd4b20652f6a78aa340f29458a2
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 15:36:18 2010 -0700
use lsb_release -cs, instead of -d
diff --git a/packaging/deb.am b/packaging/deb.am
index 80b2146..6ad3928 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -184,9 +184,10 @@ deb-edit-changelog:
if test -e /etc/lsb-release; then \
. /etc/lsb-release; \
dist=$${DISTRIB_CODENAME}; \
- else \
+ fi; \
+ if test x"$${dist}" = x; then \
if test -x /usr/bin/lsb_release; then \
- dist=`lsb_release -d | cut -d ' ' -f 4 | sed -e "s:(::" -e
"s:)::"`; \
+ dist="`lsb_release -cs`"; \
else \
dist="lenny"; \
fi; \
@@ -194,6 +195,11 @@ deb-edit-changelog:
else \
dist=$(DIST); \
fi; \
+ if test -z "$$dist" ; then \
+ echo "Missing distribution name"; exit 1; \
+ else \
+ echo "Building for distribution '$$dist''"; \
+ fi; \
if test -e $(BUILD_DIR)/debian/changelog; then \
mv -f $(BUILD_DIR)/debian/changelog
$(BUILD_DIR)/debian/changelog.orig; \
sed -e "s:master:$(BUILD_VERSION):" -e "s/distro/$${dist}/"
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
http://git.savannah.gnu.org/cgit//commit/?id=a736d0bfe036f7a23312bb7cf12d4b2e0262b245
commit a736d0bfe036f7a23312bb7cf12d4b2e0262b245
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 15:24:53 2010 -0700
don't add libltdl to GNASH_LIBS, it's already in libgnashbase
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 80fffd4..1838149 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -131,12 +131,12 @@ GNASH_LIBS = \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libbase/libgnashbase.la
-if LIBLTDL2
-GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
-endif
-if LIBLTDL1
-GNASH_LIBS += $(top_builddir)/libbase/libltdlc.la
-endif
+# if LIBLTDL2
+# GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
+# endif
+# if LIBLTDL1
+# GNASH_LIBS += $(top_builddir)/libbase/libltdlc.la
+# endif
# Only build loadable modules unless statically linking
# if DYNAMIC_GUI # make shared libraries suitable for dlopen().
http://git.savannah.gnu.org/cgit//commit/?id=8996f4b2cbfa06022a95caf737ad87003d4e7834
commit 8996f4b2cbfa06022a95caf737ad87003d4e7834
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 15:22:52 2010 -0700
don't add (LIBLTDL) to LDFLAGS, libltdl is part of libgnashbase.
diff --git a/gui/aos4/aos4.am b/gui/aos4/aos4.am
index 958fec7..781c217 100644
--- a/gui/aos4/aos4.am
+++ b/gui/aos4/aos4.am
@@ -31,7 +31,7 @@ aos4_gnash_SOURCES = $(GUI_SRCS) \
aos4/aos4.cpp \
aos4/aos4sup.h \
aos4/aos4_glue.h
-aos4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+aos4_gnash_LDFLAGS = -export-dynamic
#aos4_gnash_DEPENDENCIES = .configline
aos4_gnash_LDADD = \
$(top_builddir)/librender/libgnashrender.la \
diff --git a/gui/aqua/aqua.am b/gui/aqua/aqua.am
index 127dddd..c179a07 100644
--- a/gui/aqua/aqua.am
+++ b/gui/aqua/aqua.am
@@ -51,11 +51,11 @@ libgnashaqua_ogl_la_LIBADD =
endif # HAVE_OPENGL
# if BUILD_AGG_RENDERER
-# aqua_gnash_CPPFLAGS += $(AGG_CFLAGS)
-# aqua_gnash_LDADD += $(top_builddir)/librender/libgnashagg.la \
-# $(AQUA_LIBS) $(AGG_LIBS)
-# aqua_gnash_SOURCES += aqua_agg_glue.cpp aqua_agg_glue.h \
-# aqua.cpp aquasup.h aqua_glue.h
+# aqua_gnash_CPPFLAGS += $(AGG_CFLAGS)
+# aqua_gnash_LDADD += $(top_builddir)/librender/libgnashagg.la \
+# $(AQUA_LIBS) $(AGG_LIBS)
+# aqua_gnash_SOURCES += aqua/aqua_agg_glue.cpp aqua/aqua_agg_glue.h \
+# aqua/aqua.cpp aquasup.h aqua/aqua_glue.h
# endif
endif
diff --git a/gui/dump/dump.am b/gui/dump/dump.am
index dc362d1..d33f33d 100644
--- a/gui/dump/dump.am
+++ b/gui/dump/dump.am
@@ -23,6 +23,6 @@ bin_PROGRAMS += dump-gnash
dump_gnash_SOURCES = $(GUI_SRCS) dump/gui_dump.cpp dump/dump.cpp dump/dump.h
dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
$(AM_CPPFLAGS) $(DUMP_CFLAGS) $(AGG_CFLAGS)
-dump_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+dump_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
dump_gnash_LDADD = $(GNASH_LIBS) $(DUMP_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
endif # BUILD_DUMP_GUI
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index f3c9c1a..18a1832 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -129,7 +129,7 @@ GUI_SRCS = ../gnash.cpp \
fb_gnash_SOURCES = $(GUI_SRCS) $(DEVICES) gui_fb.cpp fb.cpp fbsup.h
fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" -DFAKEFB=\"$(FAKEFB)\" \
$(AM_CPPFLAGS)
-fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+fb_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
#fb_gnash_DEPENDENCIES = .configline
fb_gnash_LDADD = \
$(top_builddir)/librender/libgnashrender.la \
diff --git a/gui/fltk/fltk.am b/gui/fltk/fltk.am
index ace4a69..bb2feb3 100644
--- a/gui/fltk/fltk.am
+++ b/gui/fltk/fltk.am
@@ -23,7 +23,7 @@ bin_PROGRAMS += fltk-gnash
fltk_gnash_CPPFLAGS = -DGUI_FLTK -DGUI_CONFIG=\"FLTK\" \
$(AM_CPPFLAGS) $(FLTK2_CFLAGS)
fltk_gnash_SOURCES = $(GUI_SRCS) fltk/gui_fltk.cpp
-fltk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+fltk_gnash_LDFLAGS = -export-dynamic
if WIN32
fltk_gnash_LDFLAGS += -no-undefined
endif
diff --git a/gui/haiku/haiku.am b/gui/haiku/haiku.am
index 6980a48..111b73f 100644
--- a/gui/haiku/haiku.am
+++ b/gui/haiku/haiku.am
@@ -27,7 +27,7 @@ haiku_gnash_SOURCES = $(GUI_SRCS) \
haiku/haikusup.h
haiku_gnash_CPPFLAGS = -DGUI_HAIKU -DGUI_CONFIG=\"HAIKU\" \
$(AM_CPPFLAGS) $(HAIKU_CFLAGS)
-haiku_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+haiku_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
haiku_gnash_LDADD = $(GNASH_LIBS)
# all-local: haiku-gnash$(EXEEXT)
# echo
diff --git a/gui/kde/kde3.am b/gui/kde/kde3.am
index 9c16b20..79e70bc 100644
--- a/gui/kde/kde3.am
+++ b/gui/kde/kde3.am
@@ -34,7 +34,7 @@ bin_PROGRAMS += kde3-gnash
kde3_gnash_CPPFLAGS = -DGUI_KDE3 -DGUI_CONFIG=\"KDE3\" \
$(AM_CPPFLAGS) $(KDE3_CFLAGS) $(QT3_CFLAGS)
kde3_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp
-kde3_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+kde3_gnash_LDFLAGS = -export-dynamic
#kde_gnash_DEPENDENCIES = .configline
kde3_gnash_LDADD = \
$(MYSQL_LIBS) \
diff --git a/gui/sdl/sdl.am b/gui/sdl/sdl.am
index eca9279..dd9ee85 100644
--- a/gui/sdl/sdl.am
+++ b/gui/sdl/sdl.am
@@ -29,7 +29,7 @@ sdl_gnash_SOURCES = $(GUI_SRCS) \
sdl/sdlsup.h \
sdl/sdl_glue.h
-sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+sdl_gnash_LDFLAGS = -export-dynamic
sdl_gnash_LDADD = \
$(GNASH_LIBS) \
$(MYSQL_LIBS) \
http://git.savannah.gnu.org/cgit//commit/?id=b3d1c56c9c390733ab56666f13ceaf49829bc1d0
commit b3d1c56c9c390733ab56666f13ceaf49829bc1d0
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 15:16:48 2010 -0700
don't add (LIBLTDL) to LDFLAGS, libltdl is part of libgnashbase.
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index 11398b2..85bc9b1 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -28,7 +28,7 @@ gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) \
gtk/gtk.cpp gtk/gtksup.h gtk/gtk_glue.h gtk/gui_gtk.cpp
gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
$(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
-gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+gtk_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
#gtk_gnash_DEPENDENCIES = .configline
if BUILD_OGL_RENDERER
diff --git a/gui/kde/kde4.am b/gui/kde/kde4.am
index 355c401..cf715fb 100644
--- a/gui/kde/kde4.am
+++ b/gui/kde/kde4.am
@@ -50,7 +50,7 @@ kde4_gnash_SOURCES = $(GUI_SRCS) \
kde/Kde4Glue.h
kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS)
$(KDE4_CFLAGS) $(QT4_CFLAGS)
-kde4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+kde4_gnash_LDFLAGS = -export-dynamic
kde4_gnash_LDADD = \
$(MYSQL_LIBS) \
$(GNASH_LIBS) \
http://git.savannah.gnu.org/cgit//commit/?id=1794408ecb223bd08feaf9001c7f43d952a5645b
commit 1794408ecb223bd08feaf9001c7f43d952a5645b
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 14:25:47 2010 -0700
make sure revno.h exists before trying to grep it.
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 469eaa0..81c5cbf 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -20,8 +20,8 @@ NOW := $(shell date "+%Y%m%d")
# The branch nickname and revision number must be set before including
# the other Makefile fragments used for package building, as they use
# these values.
-BRANCH_REVNO = "`grep "REVNO" revno.h | cut -d '"' -f 2`"
-BRANCH_NICK = "`grep "NICK" revno.h | cut -d '"' -f 2`"
+BRANCH_REVNO = "`if test -f revno.h; then grep "REVNO" revno.h | cut -d '"'
-f 2; fi`"
+BRANCH_NICK = "`if test -f revno.h; then grep "NICK" revno.h | cut -d '"' -f
2; fi`"
# this is used for Debian style naming conventions
NEXT_RELEASE = 0.8.9
http://git.savannah.gnu.org/cgit//commit/?id=b8403eaa2605fc5510712eccf76fae7e1f185b62
commit b8403eaa2605fc5510712eccf76fae7e1f185b62
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 14:25:01 2010 -0700
don't try to use git if it doesnj't exist.
diff --git a/Makefile.am b/Makefile.am
index 1fff71b..ae60618 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,7 @@ BUILT_SOURCES = revno.h .configline
# only want to regenerate this file if that file changes, so we have to
# do the dependency check ourselves.
revno.h:
- @if test -d $(top_srcdir)/.git; then \
+ @if test -d $(top_srcdir)/.git -a x"${GIT}" != x; then \
nowmod="$(shell stat -c "%X" $(top_srcdir)/.git/index)"; \
if test -e .lastmod; then \
lastmod="$(shell cat .lastmod)"; \
http://git.savannah.gnu.org/cgit//commit/?id=ecf67826be637589682821a30dc2daa5a3c01b59
commit ecf67826be637589682821a30dc2daa5a3c01b59
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 14:09:52 2010 -0700
don't use (shell), it tries to evaluate at runtime instead of access time
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 8efdc34..469eaa0 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -20,27 +20,25 @@ NOW := $(shell date "+%Y%m%d")
# The branch nickname and revision number must be set before including
# the other Makefile fragments used for package building, as they use
# these values.
-BRANCH_REVNO := $(shell grep "REVNO" $(top_srcdir)/revno.h | cut -d '"' -f 2)
-BRANCH_NICK := $(shell grep "NICK" $(top_srcdir)/revno.h | cut -d '"' -f 2)
+BRANCH_REVNO = "`grep "REVNO" revno.h | cut -d '"' -f 2`"
+BRANCH_NICK = "`grep "NICK" revno.h | cut -d '"' -f 2`"
# this is used for Debian style naming conventions
NEXT_RELEASE = 0.8.9
#SNAPSHOT_VERSION := 0.8.8
-SNAPSHOT_VERSION := $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
+SNAPSHOT_VERSION = $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
# these is the directories where the snapshot gets built. Sources are
# in the top level, the build goes in a _build subdirectory
-SNAPSHOT_DIR := gnash-$(SNAPSHOT_VERSION)
-SNAPSHOT_BUILD := $(SNAPSHOT_DIR)/_build
-SNAPSHOT_NAME := $(SNAPSHOT_DIR)
+SNAPSHOT_DIR = gnash-$(SNAPSHOT_VERSION)
+SNAPSHOT_BUILD = $(SNAPSHOT_DIR)/_build
+SNAPSHOT_NAME = $(SNAPSHOT_DIR)
# this is the name of the actual tarball
SNAPSHOT_TAR = gnash-$(SNAPSHOT_VERSION).tar.gz
# this is the temporary directory used for DESTDIR
SNAPSHOT_TMP = /tmp/$(SNAPSHOT_DIR)
-# extract info from bazar
-
#
# build a binary snapshot from of Gnash for systems we don't have
# packaging support for.
http://git.savannah.gnu.org/cgit//commit/?id=9c465f515be5bc0783d153aba87c2959e9a0fca6
commit 9c465f515be5bc0783d153aba87c2959e9a0fca6
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 14:08:18 2010 -0700
add echo when rebuilding revno.h
diff --git a/Makefile.am b/Makefile.am
index a67b08c..1fff71b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,6 +138,7 @@ revno.h:
lastmod=0; \
fi; \
if test $${nowmod} -gt $${lastmod}; then \
+ echo "Getting build info for revno.h"; \
rm -f .lastmod; echo "$${nowmod}" > .lastmod; \
revno="`cd $(top_srcdir) ; $(GIT) log | grep '^commit' | wc -l`"; \
comm_id="`cd $(top_srcdir) ; $(GIT) rev-parse --short HEAD`"; \
http://git.savannah.gnu.org/cgit//commit/?id=0e36a799eeda2e3367d90c9549c304159368fe43
commit 0e36a799eeda2e3367d90c9549c304159368fe43
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 14:06:47 2010 -0700
add documentation for the revno,h target
diff --git a/Makefile.am b/Makefile.am
index 3cf940f..a67b08c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,6 +123,12 @@ BUILT_SOURCES = revno.h .configline
# keep the current revno.h file (which should be part of any distribution).
# It's primarily used by the testsuites and when building binary packages
# from multiple branches.
+#
+# This ia a big hack around makes's built in dependency checking, as the
+# key file here isn't part of the normal files. In the source tree for
+# developers, the .git/index files changes on any commits or pulls. We
+# only want to regenerate this file if that file changes, so we have to
+# do the dependency check ourselves.
revno.h:
@if test -d $(top_srcdir)/.git; then \
nowmod="$(shell stat -c "%X" $(top_srcdir)/.git/index)"; \
@@ -144,14 +150,14 @@ revno.h:
fi; \
if test $${nowmod} -gt $${lastmod}; then \
echo "Generating revno.h ($${nick} $${revno} $${comm_id})"; \
- echo "static const char* BRANCH_REVNO = \"$${revno}\";" >
$(top_builddir)/revno.h; \
- echo "static const char* BRANCH_NICK = \"$${nick}\";" >>
$(top_builddir)/revno.h; \
- echo "static const char* COMMIT_ID = \"$${comm_id}\";" >>
$(top_builddir)/revno.h; \
+ echo "static const char* BRANCH_REVNO = \"$${revno}\";" > revno.h; \
+ echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h; \
+ echo "static const char* COMMIT_ID = \"$${comm_id}\";" >> revno.h; \
fi
-.configline: config.log
+.configline: revno.h
address@hidden -f .configline
- @head config.log | grep " .*/configure " | sed -e 's:^ . .*configure
::' > .configline*s
+ @head config.log | grep " .*/configure " | sed -e 's:^ . .*configure
::' > .configline
#
# Precompiled header support
http://git.savannah.gnu.org/cgit//commit/?id=035f20d7e32520e2d82b6528810815f205e26df5
commit 035f20d7e32520e2d82b6528810815f205e26df5
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 13:33:11 2010 -0700
always run libtool and libltdl tests
diff --git a/configure.ac b/configure.ac
index 5ebf49c..152ae0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1330,31 +1330,29 @@ AM_CONDITIONAL(BUILD_EXTENSIONS, [ test -n
"$extensions_list"])
GNASH_PKG_CLASSFILE
ltmajor=0
-dnl if test "${nextensions}" -gt 0 -o x"${cygnal}" != x; then
- AC_MSG_CHECKING([For the version of libtool])
- if test -d ${srcdir}/libltdl/libltdl; then
- ltver=2.x
- else
- ltver=1.x
- fi
- ltmajor=`echo $ltver | cut -d '.' -f 1`
- AC_MSG_RESULT([$ltver])
- if test $ltmajor -eq 1; then
- AC_LIBLTDL_CONVENIENCE
- AC_LIBTOOL_DLOPEN
- if test x"${windows}" = x"yes"; then
- dnl The following macro may be empty; the colon is necessary
- dnl in this case to avoid an empty if statement (which is a syntax
error).
- AC_LIBTOOL_WIN32_DLL
- :
- fi
- AC_DISABLE_STATIC
- else
- LT_INIT([dlopen win32-dll disable-static])
- LTDL_INIT([convenience recursive])
- fi
- AC_LIB_LTDL
-dnl fi
+AC_MSG_CHECKING([For the version of libtool])
+if test -d ${srcdir}/libltdl/libltdl; then
+ ltver=2.x
+else
+ ltver=1.x
+fi
+ltmajor=`echo $ltver | cut -d '.' -f 1`
+AC_MSG_RESULT([$ltver])
+if test $ltmajor -eq 1; then
+ AC_LIBLTDL_CONVENIENCE
+ AC_LIBTOOL_DLOPEN
+ if test x"${windows}" = x"yes"; then
+ dnl The following macro may be empty; the colon is necessary
+ dnl in this case to avoid an empty if statement (which is a syntax error).
+ AC_LIBTOOL_WIN32_DLL
+ :
+ fi
+ AC_DISABLE_STATIC
+else
+ LT_INIT([dlopen win32-dll disable-static])
+ LTDL_INIT([convenience recursive])
+fi
+AC_LIB_LTDL
DLOPEN="-dlopen"
DLPREOPEN="-dlpreopen"
http://git.savannah.gnu.org/cgit//commit/?id=7577e65e431f3fed179ec679578b003a2cd5e168
commit 7577e65e431f3fed179ec679578b003a2cd5e168
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 13:19:00 2010 -0700
* Use AC_SUBST for git intstead of conditional
* AC_PROG_LIBTOOL has to be after the other libtool tests
* Don't build kde3 or fltk2 when building all guis
diff --git a/configure.ac b/configure.ac
index 10dd37d..5ebf49c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,12 +282,9 @@ dnl $CXXFLAGS="$CXXFLAGS -march=${with_cpu}"
cross_compiling=yes
fi
-AC_PROG_LIBTOOL
-
AC_C_BIGENDIAN
AC_C_CONST
AC_C_INLINE
-AC_SUBST([LIBTOOL_DEPS])
AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
@@ -489,16 +486,6 @@ if test x"${haiku}" = xyes; then
AC_SUBST(HAIKU_LIBS)
fi
-DLOPEN="-dlopen"
-DLPREOPEN="-dlpreopen"
-AC_SUBST(DLOPEN)
-AC_SUBST(DLPREOPEN)
-
-dnl dnl Substitute INCLTDL and LIBLTDL in the Makefiles
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_SUBST(LIBTOOL_DEPS)
-
dnl Darwin uses libtool instead of ar to produce libraries. We determine which
one
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
@@ -646,8 +633,6 @@ AC_ARG_ENABLE(gui,
all|ALL)
build_dump=yes
build_fb=yes
- build_fltk=yes
- build_kde3=yes
build_kde4=yes
build_sdl=yes
;;
@@ -1217,7 +1202,7 @@ AC_PATH_PROG(CSOUND, csound)
AM_CONDITIONAL(HAVE_CSOUND, test x"$CSOUND" != x)
AC_PATH_PROG(GIT, git)
-AM_CONDITIONAL(HAVE_GIT, test x"$GIT" != x)
+AC_SUBST(GIT)
dnl -------------------------------------
dnl LIRC
@@ -1237,7 +1222,6 @@ AM_CONDITIONAL(USE_LIRC, test x$lirc = xyes)
dnl --------------------------------------------------------
dnl Extension selection
dnl --------------------------------------------------------
-extensions_list=
ext_dejagnu=no
ext_mysql=no
ext_fileio=no
@@ -1246,6 +1230,7 @@ ext_lirc=no
ext_dbus=no
ext_all=no
ext_launcher=no
+extensions_list=
nextensions=0
AC_ARG_ENABLE(extensions,
AC_HELP_STRING([--enable-extensions=], [Specify which extensions to build]),
@@ -1345,7 +1330,7 @@ AM_CONDITIONAL(BUILD_EXTENSIONS, [ test -n
"$extensions_list"])
GNASH_PKG_CLASSFILE
ltmajor=0
-if test "${nextensions}" -gt 0; then
+dnl if test "${nextensions}" -gt 0 -o x"${cygnal}" != x; then
AC_MSG_CHECKING([For the version of libtool])
if test -d ${srcdir}/libltdl/libltdl; then
ltver=2.x
@@ -1369,7 +1354,19 @@ if test "${nextensions}" -gt 0; then
LTDL_INIT([convenience recursive])
fi
AC_LIB_LTDL
-fi
+dnl fi
+
+DLOPEN="-dlopen"
+DLPREOPEN="-dlpreopen"
+AC_SUBST(DLOPEN)
+AC_SUBST(DLPREOPEN)
+
+dnl dnl Substitute INCLTDL and LIBLTDL in the Makefiles
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+
+AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
AM_CONDITIONAL(LIBLTDL1, [test $ltmajor -eq 1])
http://git.savannah.gnu.org/cgit//commit/?id=f4e65b5b1ec20a857880ae7f60a3af0b3f259d1c
commit f4e65b5b1ec20a857880ae7f60a3af0b3f259d1c
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 13:15:21 2010 -0700
* Only regenerate revno.h after a git commit or pull.
* Build revno,.h in the build tree, not the source tree so this still works
on NFS mounted filesystems.
* Default to the date if there are any problems with git
* Only remove revno.h for a maintainer clean.
diff --git a/Makefile.am b/Makefile.am
index 99c99ca..3cf940f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,6 +114,7 @@ EXTRA_DIST = \
# cp -p $(srcdir)/*.am $(top_distdir)/packaging/
CLEANFILES = .configline
+MAINTAINERCLEANFILES = revno.h .lastmod
BUILT_SOURCES = revno.h .configline
#
@@ -122,43 +123,35 @@ BUILT_SOURCES = revno.h .configline
# keep the current revno.h file (which should be part of any distribution).
# It's primarily used by the testsuites and when building binary packages
# from multiple branches.
-#
-# It will NOT be removed by any 'clean' rule (eventually, it should be
-# removed by maintainer-clean...)
-#
revno.h:
-if HAVE_GIT
- @cd $(top_srcdir); \
- if test -d .git; then \
- revno=`$(GIT) log | grep '^commit' | wc -l`; \
- comm_id=`$(GIT) rev-parse --short HEAD`; \
- nick=`$(GIT) branch | grep '^\*' | cut -d ' ' -f 2`; \
- echo "static const char* BRANCH_REVNO = \"$${revno}\";" > revno.h.n; \
- echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h.n; \
- echo "static const char* COMMIT_ID = \"$${comm_id}\";" >> revno.h.n; \
- if test -e revno.h; then \
- if diff -q revno.h.n revno.h > /dev/null; then \
- echo "Current revno.h is up to date ($${nick} $${revno}
$${comm_id})"; \
- rm -f revno.h.n; \
- else \
- echo "Updating revno.h ($${nick} $${revno} $${comm_id})"; \
- mv revno.h.n revno.h; \
- fi; \
+ @if test -d $(top_srcdir)/.git; then \
+ nowmod="$(shell stat -c "%X" $(top_srcdir)/.git/index)"; \
+ if test -e .lastmod; then \
+ lastmod="$(shell cat .lastmod)"; \
+ else \
+ lastmod=0; \
+ fi; \
+ if test $${nowmod} -gt $${lastmod}; then \
+ rm -f .lastmod; echo "$${nowmod}" > .lastmod; \
+ revno="`cd $(top_srcdir) ; $(GIT) log | grep '^commit' | wc -l`"; \
+ comm_id="`cd $(top_srcdir) ; $(GIT) rev-parse --short HEAD`"; \
+ nick="`cd $(top_srcdir) ; $(GIT) branch | grep '^\*' | cut -d ' '
-f 2`"; \
+ fi; \
else \
- echo "Generating revno.h ($${nick} $${revno} $${comm_id})"; \
- mv revno.h.n revno.h; \
+ revno="$(NOW)"; \
+ nick="master"; \
+ comm_id="none"; \
fi; \
- else \
- echo "Source is not in a git repository, revno.h won't be updated"; \
- fi;
-else
- @echo "You don't have git installed, revno.h won't be updated";
-endif
-
+ if test $${nowmod} -gt $${lastmod}; then \
+ echo "Generating revno.h ($${nick} $${revno} $${comm_id})"; \
+ echo "static const char* BRANCH_REVNO = \"$${revno}\";" >
$(top_builddir)/revno.h; \
+ echo "static const char* BRANCH_NICK = \"$${nick}\";" >>
$(top_builddir)/revno.h; \
+ echo "static const char* COMMIT_ID = \"$${comm_id}\";" >>
$(top_builddir)/revno.h; \
+ fi
.configline: config.log
address@hidden -f .configline
- @head config.log | grep " .*/configure " | sed -e 's:^ . .*configure
::' > .configline
+ @head config.log | grep " .*/configure " | sed -e 's:^ . .*configure
::' > .configline*s
#
# Precompiled header support
http://git.savannah.gnu.org/cgit//commit/?id=7d7175dfa8c7c228fce2ac829ae86c63b42c435d
commit 7d7175dfa8c7c228fce2ac829ae86c63b42c435d
Author: Rob Savoye <address@hidden>
Date: Thu Dec 9 13:15:02 2010 -0700
delete old libtool m4 files from macros when generating libltdl. When using
libtoolize 1, the m4 macros are ihn libltdl, so add that path so we get the
right macros.
diff --git a/autogen.sh b/autogen.sh
index 43d5dbf..25990ab 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -142,6 +142,10 @@ if test -z "$NO_LIBTOOLIZE" ; then
# possible these files are being regenerated on a machine with a
# different version of libtoolize.
rm -fr libltdl
+ # delete the old libtool config macros too, or things break when downgrading
+ # to libtool 1.x.
+ rm -fr macros/libtool.m4 macros/ltdl.m4 macros/ltoptions.m4
+ rm -fr macros/ltsugar.m4 macros/ltversion.m4 macros/lt~obsolete.m4
if ${LIBTOOLIZE:-libtoolize} ${libtoolflags}; then
# libtool insists on including config.h, but we use gnashconfig.h
# to avoid any problems, so we have to change this include
@@ -192,24 +196,26 @@ do
aclocalinclude="-I cygnal ${aclocalinclude}"
fi
- if test -d libltdl/m4; then
- aclocalinclude="-I libltdl/m4 -I macros $ACLOCAL_FLAGS"
+ # libtoolize 1.x puts the additional config files in the top level libltdl
+ # libtoolize puits them in ourt own macros subdirectory.
+ if test -f libltdl/acinclude.m4; then
+ aclocalinclude="-I libltdl ${aclocalinclude}"
fi
- if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
- echo "Running intltoolize --copy --force --automake ..."
- ${INTLTOOLIZE:-intltoolize} --copy --force --automake
- fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
- echo "Running xml-i18n-toolize --copy --force --automake..."
- xml-i18n-toolize --copy --force --automake
- fi
+ if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ fi
+ if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
+ echo "Running intltoolize --copy --force --automake ..."
+ ${INTLTOOLIZE:-intltoolize} --copy --force --automake
+ fi
+ if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
+ echo "Running xml-i18n-toolize --copy --force --automake..."
+ xml-i18n-toolize --copy --force --automake
+ fi
# if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
# if test -z "$NO_LIBTOOLIZE" ; then
# echo "Running libtoolize --force --copy ..."
@@ -217,7 +223,7 @@ do
# fi
# fi
echo "Running aclocal $aclocalinclude ..."
- ${ACLOCAL:-aclocal} $aclocalinclude
+ ${ACLOCAL:-aclocal} ${aclocalinclude}
if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..."
${AUTOHEADER:-autoheader}
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 62 ++++++++++++++++++++--------------------
autogen.sh | 40 +++++++++++++++-----------
configure.ac | 75 +++++++++++++++++++++++--------------------------
gui/Makefile.am | 12 ++++----
gui/aos4/aos4.am | 2 +-
gui/aqua/aqua.am | 10 +++---
gui/dump/dump.am | 2 +-
gui/fb/Makefile.am | 2 +-
gui/fltk/fltk.am | 2 +-
gui/gtk/gtk.am | 2 +-
gui/haiku/haiku.am | 2 +-
gui/kde/kde3.am | 2 +-
gui/kde/kde4.am | 2 +-
gui/sdl/sdl.am | 2 +-
packaging/deb.am | 10 +++++-
packaging/snapshot.am | 14 ++++-----
16 files changed, 123 insertions(+), 118 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. f4bfb36984347440f57cc3941c45346f9e9aab9e,
Rob Savoye <=