From 8900318801ee46ac40d62f1a5b39acbf343dd8ac Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 15 Apr 2014 17:58:33 +0000
Subject: [PATCH] Ajustando configurações do libreoffice de acordo com o sistema operacional

---
 configure.ac            | 55 +++++++++++++++++++++++++++++++++++--------------------
 src/loffice/Makefile.in | 10 +++-------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/configure.ac b/configure.ac
index 33cd57f..f3200b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,29 +496,43 @@ AC_ARG_VAR([OFFICE_HOME], [Libreoffice home])
 AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home])
 AC_ARG_VAR([OO_SDK_URE_HOME], [Libreoffice URE home])
 
-if test "_$OFFICE_HOME" == "_" ; then
-	if test "$host_cpu" = "x86_64"; then
-		OFFICE_HOME="/usr/lib64/libreoffice"
-	else
-		OFFICE_HOME="/usr/lib/libreoffice"
-	fi
-fi
+case "$host" in
+        *-mingw32)
+		app_cv_office="no"
+		;;
 
-if test "_$OO_SDK_HOME" == "_" ; then
-	OO_SDK_HOME=$OFFICE_HOME/sdk
-fi
+	*-apple-*)
+		app_cv_office="no"
+		;;
 
-if test "_$OO_SDK_URE_HOME" == "_" ; then
-	if test -d $OFFICE_HOME/ure; then
-		OO_SDK_URE_HOME="$OFFICE_HOME/ure"
-	else
-		if test "$host_cpu" = "x86_64"; then
-			OO_SDK_URE_HOME="/usr/lib64/ure"
-		else
-			OO_SDK_URE_HOME="/usr/lib/ure"
+	*)
+		OO_LDFLAGS="-luno_cppu -luno_cppuhelpergcc3 -luno_salhelpergcc3"
+
+		if test "_$OFFICE_HOME" == "_" ; then
+			if test "$host_cpu" = "x86_64"; then
+				OFFICE_HOME="/usr/lib64/libreoffice"
+			else
+				OFFICE_HOME="/usr/lib/libreoffice"
+			fi
 		fi
-	fi
-fi
+
+		if test "_$OO_SDK_HOME" == "_" ; then
+			OO_SDK_HOME=$OFFICE_HOME/sdk
+		fi
+
+		if test "_$OO_SDK_URE_HOME" == "_" ; then
+			if test -d $OFFICE_HOME/ure; then
+				OO_SDK_URE_HOME="$OFFICE_HOME/ure"
+			else
+				if test "$host_cpu" = "x86_64"; then
+					OO_SDK_URE_HOME="/usr/lib64/ure"
+				else
+					OO_SDK_URE_HOME="/usr/lib/ure"
+				fi
+			fi
+		fi
+
+esac
 
 # Setup c++ compiler flags
 if test -d "$prefix/include/libreoffice"; then
@@ -604,6 +618,7 @@ AC_SUBST(OO_SDK_HOME)
 AC_SUBST(OO_SDK_URE_HOME)
 AC_SUBST(IDLDIR)
 AC_SUBST(OO_CXXFLAGS)
+AC_SUBST(OO_LDFLAGS)
 
 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
 AC_SUBST(LIB3270_REQUIRES)
diff --git a/src/loffice/Makefile.in b/src/loffice/Makefile.in
index 4a11666..6800983 100644
--- a/src/loffice/Makefile.in
+++ b/src/loffice/Makefile.in
@@ -88,16 +88,10 @@ include $(CLASSLIBDIR)/class.mak
 #---[ Build options ]----------------------------------------------------------
 
 CXXFLAGS=@CXXFLAGS@ @OO_CXXFLAGS@ -I../include -I./include -DLANGUAGE_BINDING_NAME=\"gcc3\"
-#
-#CPPUENV="gcc3"
-#CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing \
-#			-I../include -I./include -I$(includedir)/libreoffice \
-#			-DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\"
-#
 
 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
 			-Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \
-			-luno_cppu -luno_cppuhelpergcc3 -luno_salhelpergcc3
+			@OO_LDFLAGS@
 
 #---[ Rules ]------------------------------------------------------------------
 
@@ -146,6 +140,8 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
 
 #---[ Release targets ]--------------------------------------------------------
 
+all: $(BINDIR)/$(PACKAGE_NAME).oxt
+
 Release: include/$(PACKAGE_NAME)/lib3270.hpp \
 		$(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \
 		$(RDBDIR)/$(PACKAGE_NAME).rdb \
--
libgit2 0.21.2