[Libreoffice-commits] .: Branch 'libreoffice-3-3' - configure.in

[Thomas Klausner]

 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e2cd972ab3106918113011595edccc1ec036e277
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Fri Dec 3 16:00:13 2010 +0100

    Don't override CFLAGS nor LDFLAGS, just append to them.
    
    Ok mmeeks@

diff --git a/configure.in b/configure.in
index 1537b4d..23b664b 100644
--- a/configure.in
+++ b/configure.in
@@ -5308,8 +5308,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", [])