Fix bootstrapping with recent bits.

I can no longer bootstrap this package on my systems for a few reasons:

- Libtool has changed how nonrecursive libltdl is integrated
- The version of Gnulib in use does not bootstrap with dash
- The dxcommon scripts use Perl modules that I no longer install.

Do the necessary dance to fix all those issues, and resolve all the
resulting fallout.

diff --git a/.gitignore b/.gitignore
index dd4c21268f56a30f0c8da6dd72583829b153175b..15c133e6e3580bdcb245dfcfe0c3fa1c8d457fd7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@ Makefile.in
 /snippet
 /upkg
 /test-suite.log
 /snippet
 /upkg
 /test-suite.log

+/test-driver
+/exported.sh

diff --git a/Makefile.am b/Makefile.am
index 1fc339f14f00bc238af3d8ceb6cb82270a84b527..eb23a83cdf4c233c1b5b23c5e0f03e80c1e0ce9e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 # There is NO WARRANTY, to the extent permitted by law.
 
 AUTOMAKE_OPTIONS = parallel-tests color-tests
 # There is NO WARRANTY, to the extent permitted by law.
 
 AUTOMAKE_OPTIONS = parallel-tests color-tests

-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I common/m4

 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
 CLEANFILES =
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
 CLEANFILES =

diff --git a/bootstrap b/bootstrap
index 4304be0f5dccc8517357ec0dc8977e9d4d7343ca..d7e5087db43f9784761cb01796a426534999d897 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# Copyright © 2011-2012 Nick Bowler
+# Copyright © 2011-2012, 2015 Nick Bowler

 #
 # Simple script to get started from a fresh git checkout.
 #
 #
 # Simple script to get started from a fresh git checkout.
 #


@@ -36,9 +36,18 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
        || die "Failed to fixup Gnulib makefile fragment."
 

+# Frustratingly, libtoolize has changed the name of its nonrecursive ltdl
+# makefile output, which broke all packages depending on previous documented
+# behaviour.  Work around the issue by renaming the output.
+rm -f libltdl/ltdl.mk

 $LIBTOOLIZE -f || die "Failed to run libtoolize."
 $LIBTOOLIZE -f || die "Failed to run libtoolize."

+test ! -f libltdl/Makefile.inc || mv -f libltdl/Makefile.inc libltdl/ltdl.mk.in
+test ! -f libltdl/ltdl.mk || mv -f libltdl/ltdl.mk libltdl/ltdl.mk.in

 
 

-$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/Makefile.inc \
+$PERL common/scripts/fix-ltdl.pl -o libltdl/ltdl.mk -i libltdl/ltdl.mk.in \

        || die "Failed to fixup libltdl makefile fragment."
 
        || die "Failed to fixup libltdl makefile fragment."
 

+# Punt some automake-generated files so that Gentoo's wrapper script doesn't
+# try to detect the automake version in use.
+rm -f Makefile.in aclocal.m4

 LIBTOOLIZE=true $AUTORECONF -fis
 LIBTOOLIZE=true $AUTORECONF -fis

diff --git a/common b/common
index ff3807b3c1ad23f6a8811241665a00a0c9e957f4..483b5af7a619117ae6ec3435bb8689e764e928a0 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ff3807b3c1ad23f6a8811241665a00a0c9e957f4
+Subproject commit 483b5af7a619117ae6ec3435bb8689e764e928a0

diff --git a/configure.ac b/configure.ac
index 43dc62a905a473bef5bc71867eb6e488157c2b93..21069aa1d3a92aa1fcb453978bf50c5b7d5d56a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR([src/libupkg.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 

-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])

 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PROG_CC_C99
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PROG_CC_C99

diff --git a/gnulib b/gnulib
index aa3de1af836fb58f4d28214154afc804e85e49f9..233419c39c6d13d84439b95766328a238ffb6518 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit aa3de1af836fb58f4d28214154afc804e85e49f9
+Subproject commit 233419c39c6d13d84439b95766328a238ffb6518

diff --git a/m4/.gitignore b/m4/.gitignore
index d191decb58176926f892bce6e32eab5554d712b3..d89469b5b4655ed18fd50cf5cd566f75e8ddd3c6 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,15 +1,17 @@
 00gnulib.m4
 00gnulib.m4

-argz.m4

 copysignf.m4
 exponentd.m4
 exponentf.m4
 exponentl.m4
 extensions.m4
 copysignf.m4
 exponentd.m4
 exponentf.m4
 exponentl.m4
 extensions.m4

+extern-inline.m4

 float_h.m4
 fpieee.m4
 getopt.m4
 float_h.m4
 fpieee.m4
 getopt.m4

+gnulib-cache.m4~

 gnulib-common.m4
 gnulib-comp.m4
 gnulib-common.m4
 gnulib-comp.m4

+gnulib-comp.m4~

 gnulib-tool.m4
 include_next.m4
 isnand.m4
 gnulib-tool.m4
 include_next.m4
 isnand.m4


@@ -18,6 +20,7 @@ isnanl.m4
 ldexp.m4
 ldexpf.m4
 libtool.m4
 ldexp.m4
 ldexpf.m4
 libtool.m4

+ltargz.m4

 ltdl.m4
 ltoptions.m4
 ltsugar.m4
 ltdl.m4
 ltoptions.m4
 ltsugar.m4

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index da9334c623f32e7e047bd6eaa9e57e6053d83b7a..39ed0f60ae7923f547499d544e219e2827d2efaf 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.

 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -49,5 +49,5 @@ gl_CONDITIONAL_DEPENDENCIES
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])

-gl_WITNESS_C_DOMAIN([])
+gl_WITNESS_C_MACRO([])

 gl_VC_FILES([false])
 gl_VC_FILES([false])

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 9c5bfa13a3ccc9949a4cc687dab2067aa83f8c3b..c3cc24662ce4a69980b0086c8693c4b651f05d0a 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.

- *  Copyright © 2009-2011 Nick Bowler
+ *  Copyright © 2009-2012, 2015 Nick Bowler

  *
  *  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
  *
  *  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


@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

+#include <config.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/tests/.gitignore b/tests/.gitignore
index 397b4a7624e35fa60563a9c03b1213d93f7b6546..7e563b8b3023b7b9cc879c0052dfcc26b9f82505 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,2 @@
 *.log
 *.log

+*.trs