From edc127c9ae20a4c62b3f1446ca6f0c290dfeef57 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Mon, 25 Mar 2013 12:37:17 +0000
Subject: [PATCH] Ajustando deteccao do SDK do libreoffice

---
 configure.ac        | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 po/pt_BR.po         |  2 +-
 src/oxt/Makefile.in | 10 +++++-----
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index c765d02..a36bed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,6 +422,52 @@ AC_SUBST(REXXCONFIG)
 AC_SUBST(REXX_CFLAGS)
 AC_SUBST(REXX_LIBS)
 
+#--[ Libreoffice ]--------------------------------------------------------------------------------------------------------------------------------------------
+
+AC_ARG_ENABLE([office],[AS_HELP_STRING([--disable-office], [Disable libreoffice extension])],[ app_cv_office="$enableval" ],[ app_cv_office="yes" ])
+
+AC_ARG_VAR([OFFICE_HOME], [Libreoffice home])
+AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home])
+
+OO_SDK_URE_HOME=$OFFICE_HOME/ure
+OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin
+OO_SDK_URE_LIB_DIR=$OO_SDK_URE_HOME/lib
+
+AC_PATH_TOOL([IDLC], idlc, "no", path="$PATH:$OO_SDK_HOME/bin")
+if test "$IDLC" == "no" ; then
+	app_cv_office="no"
+fi
+
+AC_PATH_TOOL([REGMERGE], regmerge, "no", path="$PATH:$OO_SDK_URE_BIN_DIR")
+if test "$REGMERGE" == "no" ; then
+	app_cv_office="no"
+fi
+
+AC_PATH_TOOL([CPPUMAKER], cppumaker, "no", path="$PATH:$OO_SDK_HOME/bin")
+if test "$CPPUMAKER" == "no" ; then
+	app_cv_office="no"
+fi
+
+# Check for OO_SDK_HOME
+if test "_$OO_SDK_HOME" == "_" ; then
+	app_cv_office="no"
+fi
+
+# Check for OFFICE_HOME
+if test "_$OFFICE_HOME" == "_" ; then
+	app_cv_office="no"
+fi
+
+# Set targets
+if test "$app_cv_office" == "yes" ; then
+	AC_MSG_NOTICE([libreoffice sdk is present.])
+else
+	AC_MSG_NOTICE([libreoffice sdk is NOT present.])
+fi
+
+AC_SUBST(OFFICE_HOME)
+AC_SUBST(OO_SDK_HOME)
+
 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
 AC_SUBST(LIB3270_REQUIRES)
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 25cee39..ffb8a88 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-15 10:08-0300\n"
+"POT-Creation-Date: 2013-03-25 08:38-0300\n"
 "PO-Revision-Date: 2013-03-12 11:29-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
diff --git a/src/oxt/Makefile.in b/src/oxt/Makefile.in
index fb9f7b1..b0543c1 100644
--- a/src/oxt/Makefile.in
+++ b/src/oxt/Makefile.in
@@ -35,8 +35,8 @@ RLS_CFLAGS=-DNDEBUG=1
 #---[ LibreOffice SDK ]--------------------------------------------------------------------------------
 COMID=gcc3
 OO_SDK_NAME=openoffice.org3.5_sdk
-OFFICE_HOME=${libdir}/libreoffice
-OO_SDK_HOME=${OFFICE_HOME}/sdk
+OFFICE_HOME=@OFFICE_HOME@
+OO_SDK_HOME=@OO_SDK_HOME@
 OO_SDK_URE_HOME=${OFFICE_HOME}/ure
 OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
 OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
@@ -51,9 +51,9 @@ REGLIB=-lreg
 STORELIB=-lstore
 
 # Libre office tools
-IDLC=${OO_SDK_HOME}/bin/idlc
-REGMERGE=${OO_SDK_URE_BIN_DIR}/regmerge
-CPPUMAKER=${OO_SDK_HOME}/bin/cppumaker
+IDLC=@IDLC@
+REGMERGE=@REGMERGE@
+CPPUMAKER=@CPPUMAKER@
 
 #---[ Rules ]------------------------------------------------------------------------------------------
 
--
libgit2 0.21.2