[netcf-devel] [PATCH] build: ensure gnulib usage works with libtool

Laine Stump laine at laine.org
Thu Sep 9 20:10:55 UTC 2010


  On 09/09/2010 03:12 PM, Eric Blake wrote:
> * bootstrap (gnulib_tool): Add --libtool.
> * autogen.sh (bootstrap): Add --gnulib-srcdir when needed.  Touch
> ChangeLog.
> * configure.ac (AC_CONFIG_MACRO_DIR): Add, to silence libtool
> warning.
> * ChangeLog: No longer store in VCS.
> ---
>
> Without this, relatively new gnulib-tool tries to create libgnu.a
> instead of libgnu.la, breaking make.
>
> Someday, we should switch to a gnulib submodule (libvirt and augeas
> can serve as examples how), but this patch is good enough for now.
>
>   autogen.sh   |    2 +-
>   bootstrap    |    1 +
>   configure.ac |    1 +
>   3 files changed, 3 insertions(+), 1 deletions(-)
>   delete mode 100644 ChangeLog
>
> diff --git a/ChangeLog b/ChangeLog
> deleted file mode 100644
> index e69de29..0000000
> diff --git a/autogen.sh b/autogen.sh
> index 156c5fa..b0197c3 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -85,7 +85,7 @@ fi
>   mkdir -p $BUILD_AUX
>
>   $LIBTOOLIZE --copy --force
> -./bootstrap $GNULIB_SRCDIR
> +./bootstrap ${GNULIB_SRCDIR:+--gnulib-srcdir="$GNULIB_SRCDIR"}
>   aclocal -I gnulib/m4
>   autoheader
>   automake --add-missing
> diff --git a/bootstrap b/bootstrap
> index f0653ef..e560764 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -77,4 +77,5 @@ $gnulib_tool			\
>     --tests-base=gnulib/tests	\
>     --aux-dir=build/aux           \
>     --quiet                       \
> +  --libtool                     \
>     --import $modules
> diff --git a/configure.ac b/configure.ac
> index 1475875..25ef95f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1,6 +1,7 @@
>   AC_INIT(netcf, 0.1.6)
>   AC_CONFIG_SRCDIR([src/netcf.c])
>   AC_CONFIG_AUX_DIR([build/aux])
> +AC_CONFIG_MACRO_DIR([gnulib/m4])
>   AM_CONFIG_HEADER([config.h])
>   AM_INIT_AUTOMAKE([-Wno-portability 1.11 color-tests parallel-tests])
>   AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.

ACK, and pushed. Thanks!


More information about the netcf-devel mailing list