Download as
Browse Code »

Commit edc127c9ae20a4c62b3f1446ca6f0c290dfeef57

Authored by perry.werneck@gmail.com
1 parent a8520a6f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustando deteccao do SDK do libreoffice

Showing 3 changed files with 52 additions and 6 deletions   Show diff stats
configure.ac
  Diff comments   View file @edc127c
... ... @@ -422,6 +422,52 @@ AC_SUBST(REXXCONFIG)
422 422 AC_SUBST(REXX_CFLAGS)
423 423 AC_SUBST(REXX_LIBS)
424 424  
  425 +#--[ Libreoffice ]--------------------------------------------------------------------------------------------------------------------------------------------
  426 +
  427 +AC_ARG_ENABLE([office],[AS_HELP_STRING([--disable-office], [Disable libreoffice extension])],[ app_cv_office="$enableval" ],[ app_cv_office="yes" ])
  428 +
  429 +AC_ARG_VAR([OFFICE_HOME], [Libreoffice home])
  430 +AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home])
  431 +
  432 +OO_SDK_URE_HOME=$OFFICE_HOME/ure
  433 +OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin
  434 +OO_SDK_URE_LIB_DIR=$OO_SDK_URE_HOME/lib
  435 +
  436 +AC_PATH_TOOL([IDLC], idlc, "no", path="$PATH:$OO_SDK_HOME/bin")
  437 +if test "$IDLC" == "no" ; then
  438 + app_cv_office="no"
  439 +fi
  440 +
  441 +AC_PATH_TOOL([REGMERGE], regmerge, "no", path="$PATH:$OO_SDK_URE_BIN_DIR")
  442 +if test "$REGMERGE" == "no" ; then
  443 + app_cv_office="no"
  444 +fi
  445 +
  446 +AC_PATH_TOOL([CPPUMAKER], cppumaker, "no", path="$PATH:$OO_SDK_HOME/bin")
  447 +if test "$CPPUMAKER" == "no" ; then
  448 + app_cv_office="no"
  449 +fi
  450 +
  451 +# Check for OO_SDK_HOME
  452 +if test "_$OO_SDK_HOME" == "_" ; then
  453 + app_cv_office="no"
  454 +fi
  455 +
  456 +# Check for OFFICE_HOME
  457 +if test "_$OFFICE_HOME" == "_" ; then
  458 + app_cv_office="no"
  459 +fi
  460 +
  461 +# Set targets
  462 +if test "$app_cv_office" == "yes" ; then
  463 + AC_MSG_NOTICE([libreoffice sdk is present.])
  464 +else
  465 + AC_MSG_NOTICE([libreoffice sdk is NOT present.])
  466 +fi
  467 +
  468 +AC_SUBST(OFFICE_HOME)
  469 +AC_SUBST(OO_SDK_HOME)
  470 +
425 471 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
426 472 AC_SUBST(LIB3270_REQUIRES)
427 473  
... ...
po/pt_BR.po
  Diff comments   View file @edc127c
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2013-03-15 10:08-0300\n"
  8 +"POT-Creation-Date: 2013-03-25 08:38-0300\n"
9 9 "PO-Revision-Date: 2013-03-12 11:29-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
... ...
src/oxt/Makefile.in
  Diff comments   View file @edc127c
... ... @@ -35,8 +35,8 @@ RLS_CFLAGS=-DNDEBUG=1
35 35 #---[ LibreOffice SDK ]--------------------------------------------------------------------------------
36 36 COMID=gcc3
37 37 OO_SDK_NAME=openoffice.org3.5_sdk
38   -OFFICE_HOME=${libdir}/libreoffice
39   -OO_SDK_HOME=${OFFICE_HOME}/sdk
  38 +OFFICE_HOME=@OFFICE_HOME@
  39 +OO_SDK_HOME=@OO_SDK_HOME@
40 40 OO_SDK_URE_HOME=${OFFICE_HOME}/ure
41 41 OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
42 42 OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
... ... @@ -51,9 +51,9 @@ REGLIB=-lreg
51 51 STORELIB=-lstore
52 52  
53 53 # Libre office tools
54   -IDLC=${OO_SDK_HOME}/bin/idlc
55   -REGMERGE=${OO_SDK_URE_BIN_DIR}/regmerge
56   -CPPUMAKER=${OO_SDK_HOME}/bin/cppumaker
  54 +IDLC=@IDLC@
  55 +REGMERGE=@REGMERGE@
  56 +CPPUMAKER=@CPPUMAKER@
57 57  
58 58 #---[ Rules ]------------------------------------------------------------------------------------------
59 59  
... ...