Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2545
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2545/1
XINC and XLIB are never used
Change-Id: I242153584dd8e50e8163c4534acf8d8a66423b02
---
M configure.ac
1 file changed, 2 insertions(+), 36 deletions(-)
diff --git a/configure.ac b/configure.ac
index ed90a4b..573a7f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8394,18 +8394,11 @@
AC_PATH_XTRA
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- if test "x$x_includes" = "x"; then
+ if test -z "$x_includes"; then
x_includes="default_x_includes"
fi
- if test "x$x_libraries" = "x"; then
- x_libraries="default_x_libraries"
- fi
- dnl The variables $x_libraries and $x_includes are set.
if test -z "$x_libraries"; then
- AC_MSG_ERROR([No X libraries found]) # Exit
- fi
- if test -z "$x_includes"; then
- AC_MSG_ERROR([No X includes found]) # Exit
+ x_libraries="default_x_libraries"
fi
CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
@@ -8414,33 +8407,6 @@
x_includes="no_x_includes"
x_libraries="no_x_libraries"
fi
-if test -z "$x_includes"; then
- x_includes="no_x_includes"
-fi
-if test -z "$x_libraries"; then
- x_libraries="no_x_libraries"
-fi
-if test "$x_includes" = "default_x_includes"; then
- XINC="/usr/include"
-else
- XINC="$x_includes"
-fi
-AC_SUBST(XINC)
-if test "$x_libraries" = "default_x_libraries"; then
- XLIB=`$PKG_CONFIG --variable=libdir x11`
- if test "x$XLIB" = x; then
- XLIB="/usr/lib"
- fi
-else
- XLIB="$x_libraries"
-fi
-if test "$XLIB" != "no_x_libraries" -a "$XLIB" != "/usr/lib" -a "$XLIB" !=
"/usr/lib64"; then
- SOLARLIB="$SOLARLIB -L$XLIB"
-fi
-if test "$XINC" != "no_x_includes" -a "$XINC" != "/usr/include"; then
- SOLARINC="$SOLARINC -I$XINC"
-fi
-AC_SUBST(XLIB)
if test "$WANT_X11" = "yes"; then
dnl ===================================================================
--
To view, visit https://gerrit.libreoffice.org/2545
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I242153584dd8e50e8163c4534acf8d8a66423b02
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.ku...@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
