r382 - in /packages/gnash/branches/0.8.7-1~bpo50+1/debian: autogen.sh rules

miriam at users.alioth.debian.org miriam at users.alioth.debian.org
Fri Feb 19 22:48:45 UTC 2010


Author: miriam
Date: Fri Feb 19 22:48:44 2010
New Revision: 382

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=382
Log:
Fixed some stuff, still work to do (clean and config targets)


Modified:
    packages/gnash/branches/0.8.7-1~bpo50+1/debian/autogen.sh
    packages/gnash/branches/0.8.7-1~bpo50+1/debian/rules

Modified: packages/gnash/branches/0.8.7-1~bpo50+1/debian/autogen.sh
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.7-1%7Ebpo50%2B1/debian/autogen.sh?rev=382&op=diff
==============================================================================
--- packages/gnash/branches/0.8.7-1~bpo50+1/debian/autogen.sh (original)
+++ packages/gnash/branches/0.8.7-1~bpo50+1/debian/autogen.sh Fri Feb 19 22:48:44 2010
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # 
-#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -18,13 +18,17 @@
 # 
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`/..
+srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 DIE=0
 
 #Always use our macros
 #ACLOCAL_FLAGS="-I macros $ACLOCAL_FLAGS"
+
+if test "`uname`" = "Darwin"; then
+LIBTOOLIZE=glibtoolize
+fi
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -106,17 +110,66 @@
   am_opt=--include-deps;;
 esac
 
-if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize --force --ltdl --copy ..."
-	  if ${LIBTOOLIZE:-libtoolize} --force --ltdl --copy; then
-	    chmod a+w libltdl/config-h.in # Darwin needs this
-          else
-            echo
-            echo "**Error**: libtoolize failed, do you have libtool package installed?"
-            exit 1
-          fi
-	fi
+# Rather than have libltdl run it's own configure, the few tests
+# libltdl needed were added to the main configure.ac. As we need to
+# look at config.h in header files, which may conflict with other
+# versions of config.h, this has been renamed to gnashconfig,h to be
+# unique. As the files libtoolize copies insist on using config.h, we
+# just edit the name, rather than adding a fixed copy to Gnash.
+#
+# This gets more interesting with libtool 2.x, which heavily changed
+# how everything worked. Where libtool 1.5 installed only a header and
+# had a single source file, libtool 2.x has an entire sub directory
+# tree of headers and source files. So for libtool 1.5.x, we do
+# everything the way this has always worked for Gnash. For libtool
+# 2.x, we install in a subdirectory of libbase, because we have to
+# hack the build directory, and everything configures tottally
+# differernt than 1.5.x used to. For more fun, libtoolize has
+# different command line arguments, but one thing that got fixed is
+# for libtool 2.x there is an #define for the config file name, but
+# for libtool 1.5 it expects config.h always, so we change this to
+# gnashconfig.h.
+ltdlver=`${LIBTOOLIZE:-libtoolize} --version | head -1 | sed -e 's/(.*) //' | cut -d ' ' -f 2`
+ltdlmajor=`echo $ltdlver | cut -d '.' -f 1`
+if test -z "$NO_LIBTOOLIZE" ; then
+  ltbasedir="libltdl"
+  libtoolflags="--force --copy  --ltdl"
+  if test $ltdlmajor -eq 2; then
+    libtoolflags="${libtoolflags} ${ltbasedir} --quiet --recursive"
+  fi
+  echo "Running libtoolize $ltdlver ${libtoolflags} ..."
+  # We have to remove the old libltdl sources, as it's entirely
+  # possible these files are being regenerated on a machine with a
+  # different version of libtoolize.
+  rm -fr libltdl
+  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
+    # so they all reference the right config header file.
+    if test -d libltdl; then
+      for i in libltdl/*.c; do
+#      echo "Fixing $i..."
+        mv $i $i.orig
+        sed -e 's/include <config.h>/include <gnashconfig.h>/' $i.orig > $i
+      done
+    fi
+#            mv libltdl/ltdl.c libltdl/ltdl.c.orig
+#            sed -e 's/include <config.h>/include <gnashconfig.h>/' libltdl/ltdl.c.orig > libltdl/ltdl.c
+    # for libtool 1.x, we don't build in libltdl, it's built in libbase instead. autoconf doesn't like
+    # conditional output files, so we nuke the original libltdl/Makefile.am and replace it with a zero
+    # sized one to keep autoconf happy.
+    if test $ltdlmajor -eq 1; then
+       mv libltdl/Makefile.am Makefile.am.orig
+       touch libltdl/Makefile.am
+    fi
+    if test -f  ${ltbasedir}/config-h.in; then
+      chmod a+w  ${ltbasedir}/config-h.in # Darwin needs this
+    fi
+  else
+    echo
+    echo "**Error**: libtoolize failed, do you have libtool and libltdl3-dev packages installed?"
+    exit 1
+  fi
 fi
 
 #for coin in `find $srcdir -name CVS -prune -o -name configure.ac -print`
@@ -135,6 +188,14 @@
         aclocalinclude="$ACLOCAL_FLAGS"
      fi
 
+     if test -d cygnal; then
+        aclocalinclude="-I cygnal ${aclocalinclude}"
+     fi
+
+     if test -d libltdl/m4; then
+        aclocalinclude="-I libltdl/m4 -I macros $ACLOCAL_FLAGS"
+     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
@@ -157,7 +218,7 @@
 #       fi
       echo "Running aclocal $aclocalinclude ..."
       ${ACLOCAL:-aclocal} $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+      if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
 	${AUTOHEADER:-autoheader}
       fi

Modified: packages/gnash/branches/0.8.7-1~bpo50+1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.7-1%7Ebpo50%2B1/debian/rules?rev=382&op=diff
==============================================================================
--- packages/gnash/branches/0.8.7-1~bpo50+1/debian/rules (original)
+++ packages/gnash/branches/0.8.7-1~bpo50+1/debian/rules Fri Feb 19 22:48:44 2010
@@ -48,7 +48,8 @@
 
 # CONFIGURE
 
-CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
+CONFIGURE_FLAGS = \
+		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
 		LDFLAGS="$(LDFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) \
@@ -76,7 +77,7 @@
 		--with-plugins-install=system \
 		--enable-shared=yes \
 		--enable-lotsa-warnings \
-		--without-gcc-arch\
+		--without-gcc-arch
 
 config: config-stamp
 config-stamp: patch-stamp
@@ -149,37 +150,37 @@
 		for i in *.po; do intltool-update -g debian --dist $${i%.po}; done
 	rm -f debian/po/POTFILES.in
 
-#ifeq (Makefile,$(wildcard Makefile))
-#	[ ! -f Makefile ] || $(MAKE) maintainer-clean
-#	[ ! -f Makefile ] || $(MAKE) distclean
-#endif
+ifeq (Makefile,$(wildcard Makefile))
+	[ ! -f Makefile ] || $(MAKE) maintainer-clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+endif
 
 ifneq ($(wildcard ${AUTO_JUNK}),)
 	rm $(wildcard ${AUTO_JUNK})
 endif
 
-	rm -f config.sub config.guess config.log config.status
-	rm -f libtool
-	rm -f `find . -name "Makefile"| grep -v "debian/"`
-	rm -f `find . -name "*.o"`
-	rm -rf `find . -name ".libs"`
-	rm -rf `find . -name ".deps"`
-	rm -rf po/*.gmo
-	rm -f compile
-
-	rm -f configure aclocal.m4 config.h.in
-	#-find . -name Makefile.in -exec rm {} \;
-	-rm `find . -name Makefile.in`
-
-	rm -fv gnashconfig.h.in macros/ltdl.m4 macros/libtool.m4
-
-	-rm -rf libltdl/autom4te.cache
-	-rm -f libltdl/* ltmain.sh
-
-	-rm -f README.amf
-	-rm -f debian/*.png
-
-	rm -rf debian/tmp debian/tmp.opengl tmp.agg tmp.opengl
+	rm -fv config.sub config.guess config.log config.status
+	rm -fv `find . -name "Makefile"| grep -v "debian/"`
+	rm -fv `find . -name "*.o"`
+	rm -rfv `find . -name ".libs"`
+	rm -rfv `find . -name ".deps"`
+	rm -rfv po/*.gmo
+	rm -fv compile
+
+	rm -fv configure aclocal.m4 config.h.in
+	#find . -name Makefile.in -exec rm -fv {} \;
+	rm -fv `find . -name Makefile.in`
+
+#	rm -fv gnashconfig.h.in
+#	rm -fv macros/ltdl.m4 macros/libtool.m4
+
+	rm -rfv libltdl/autom4te.cache
+	rm -rfv libltdl/* ltmain.sh
+
+	rm -fv README.amf
+	rm -fv debian/*.png
+
+	rm -rfv debian/tmp debian/tmp.opengl tmp.agg tmp.opengl
 
 	printf "\n == CLEANING PATCHES ============================================ \n\n"
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch




More information about the pkg-flash-devel mailing list