[Libreoffice] [PATCH] Don't override CFLAGS and LDFLAGS

[Robert Nagy]

Yes please. I have this diff too, so just push it to both master and stable.

On (2010-12-03 15:39), Thomas Klausner wrote:
> Hi!
> 
> I'd like to push the attached patch to bootstrap.
> Currently, when finding X (on all platforms but WIN32, DARWIN with
> Aqua and OS2), CFLAGS and LDFLAGS are overridden.
> 
> The compiler and linker sometimes need some help in finding some
> system-installed libraries and this overriding breaks the standard way
> of passing in this help.
> 
> Any objections?
>  Thomas

> diff --git a/configure.in b/configure.in
> index c2129c1..fe5f455 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -5558,8 +5558,8 @@ elif test "$_os" != "WINNT" ; then
>     if test -z "$x_includes"; then
>        AC_MSG_ERROR([No X includes found]) # Exit
>     fi
> -   CFLAGS=$X_CFLAGS
> -   LDFLAGS="$X_LDFLAGS $X_LIBS"
> +   CFLAGS="$CFLAGS $X_CFLAGS"
> +   LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
>     AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
>     dnl Check if the XauDisposeAuth symbol is provided by libXau.
>     AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])

> _______________________________________________
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice