[SCM] lame/master: Include fix for alpha builds. alpha builds need include guards in config.h.

[Andres Mejia]

On Thu, Aug 4, 2011 at 7:33 PM,  <ceros-guest at users.alioth.debian.org> wrote:
> The following commit has been merged in the master branch:
> commit cbc873db2346e788eca96db7084be73fd1d4aa39
> Author: Andres Mejia <mcitadel at gmail.com>
> Date:   Thu Aug 4 19:32:06 2011 -0400
>
>    Include fix for alpha builds.
>    alpha builds need include guards in config.h.
>
> diff --git a/debian/patches/alpha-build-fix.patch b/debian/patches/alpha-build-fix.patch
> new file mode 100644
> index 0000000..1aa5853
> --- /dev/null
> +++ b/debian/patches/alpha-build-fix.patch
> @@ -0,0 +1,47 @@
> +Description: Fix for alpha builds. alpha needs include guards for config.h.
> +Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
> +
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -27,6 +27,11 @@
> + dnl automake
> + AM_INIT_AUTOMAKE
> + AC_CONFIG_HEADERS([config.h])
> ++AH_TOP([
> ++#ifndef LAME_CONFIG_H
> ++#define LAME_CONFIG_H
> ++])
> ++AH_BOTTOM([#endif /* LAME_CONFIG_H */])
> + AM_MAINTAINER_MODE
> + AM_MAKE_INCLUDE
> +
> +--- a/config.h.in
> ++++ b/config.h.in
> +@@ -1,5 +1,10 @@
> + /* config.h.in.  Generated from configure.in by autoheader.  */
> +
> ++
> ++#ifndef LAME_CONFIG_H
> ++#define LAME_CONFIG_H
> ++
> ++
> + /* debug define */
> + #undef ABORTFP
> +
> +@@ -373,3 +378,5 @@
> +
> + /* Define to `unsigned int' if <sys/types.h> does not define. */
> + #undef size_t
> ++
> ++#endif /* LAME_CONFIG_H */
> +--- a/configure
> ++++ b/configure
> +@@ -3088,6 +3088,8 @@
> + ac_config_headers="$ac_config_headers config.h"
> +
> +
> ++
> ++
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
> + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
> +     # Check whether --enable-maintainer-mode was given.
> diff --git a/debian/patches/series b/debian/patches/series
> index 323e026..0eeed71 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -4,3 +4,4 @@
>  license-ouput-change.patch
>  parallel-builds-fix.patch
>  portableio-compiler-warning-fix.patch
> +alpha-build-fix.patch
>
> --
> lame packaging
>
> _______________________________________________
> pkg-multimedia-commits mailing list
> pkg-multimedia-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits
>

An upload with this fix can wait until the current package enters testing.

-- 
Regards,
Andres Mejia