[PATCH] Revert "add extra inc. dir for URE headers"

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3500

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/3500/1

Revert "add extra inc. dir for URE headers"

Not needed anymore after moving the headers to $(SRCDIR)/include .

This reverts commit ea09e0352a82dabc26c713adc1825d89ff824178.

Conflicts:
	configure.ac

Change-Id: I96c86152d3eff66ccadc9fd76131c0b57763afae
---
M configure.ac
1 file changed, 9 insertions(+), 11 deletions(-)



diff --git a/configure.ac b/configure.ac
index 518c24b..21ee63a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3383,20 +3383,11 @@
 AC_SUBST(x_OBJCXXFLAGS)
 AC_SUBST(x_LDFLAGS)
 
-dnl ===================================================================
-dnl Product version
-dnl ===================================================================
-AC_MSG_CHECKING([for product version])
-PRODUCTVERSION=AC_PACKAGE_VERSION
-AC_MSG_RESULT([$PRODUCTVERSION])
-AC_SUBST(PRODUCTVERSION)
-
 #
 # determine CPU, CPUNAME, GUI, GUIBASE, ...
 #
 LIB64="lib"
 SOLARINC="-I${SRC_ROOT}/include"
-SDKDIR="sdk"
 
 case "$host_os" in
 
@@ -3455,7 +3446,6 @@
     OS=MACOSX
     RTL_OS=MacOSX
     P_SEP=:
-    SDKDIR="LibreOffice${PRODUCTVERSION}_SDK"
 
     case "$host_cpu" in
     arm*)
@@ -3940,7 +3930,7 @@
     INSTDIR=${BUILDDIR}/instdir/${INPATH}
 fi
 OUTDIR="${SOLARVER}/${INPATH}"
-SOLARINC="-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include $SOLARINC"
+SOLARINC="-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc $SOLARINC"
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
@@ -11333,6 +11323,14 @@
 AC_SUBST(MD5SUM)
 
 dnl ===================================================================
+dnl Product version
+dnl ===================================================================
+AC_MSG_CHECKING([for product version])
+PRODUCTVERSION=AC_PACKAGE_VERSION
+AC_MSG_RESULT([$PRODUCTVERSION])
+AC_SUBST(PRODUCTVERSION)
+
+dnl ===================================================================
 dnl Dealing with l10n options
 dnl ===================================================================
 AC_MSG_CHECKING([which languages to be built])

-- 
To view, visit https://gerrit.libreoffice.org/3500
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96c86152d3eff66ccadc9fd76131c0b57763afae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon at redhat.com>