[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d5d8320ba1fba493e0e091fd46207ea7a34cc9e7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 18 23:08:42 2016 +0000

    Revert "don't pollute cross-compilation environment with host pig-config"
    
    Caused tinderbox breakage.
    
    This reverts commit af6a39120f590a49088d58c14d46f206abe3e4c2.
    
    Change-Id: If07d3bda667001b479f41b2319bfef2e15068072
    Reviewed-on: https://gerrit.libreoffice.org/21593
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index daeb3cc..7bdea6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -490,7 +490,6 @@ if test -n "$with_android_ndk"; then
     ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections"
     ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI"
     ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}"
-    export PKG_CONFIG_LIBDIR="$ANDROID_BINUTILS_PREBUILT_ROOT/lib/pkgconfig"
 
     if test -n "$ANDROID_USING_CLANG"; then
         ANDROIDCFLAGS="$ANDROIDCFLAGS -Qunused-arguments"
@@ -4627,7 +4626,7 @@ if test "$cross_compiling" = "yes"; then
     unset CC CXX SYSBASE CFLAGS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP
     unset CPPUNIT_CFLAGS CPPUNIT_LIBS
-    unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC PKG_CONFIG_LIBDIR
+    unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC
     test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
     test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
     test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"