[Libreoffice-commits] .: 2 commits - configure.in Makefile

[René Engelhard]

 Makefile     |    2 ++
 configure.in |   29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

New commits:
commit 5582b7f129a4db4204107f2a38ac809684aa6893
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Feb 7 06:36:49 2012 +0000

    add testtools to dmake_modules

diff --git a/Makefile b/Makefile
index 24b2a5b..38ed6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ postgresql\
 postprocess\
 python\
 pyuno\
+pyuno-py3\
 rdbmaker\
 readlicense_oo\
 redland\
@@ -226,6 +227,7 @@ stlport\
 stoc\
 store\
 sysui\
+testtools\
 tomcat\
 translations\
 udm\
commit 8f06cc44149ca6be84b1cd8ce0f609d2dc3db346
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Feb 7 06:28:46 2012 +0000

    configure.in: readd arch-detection for kFreeBSD

diff --git a/configure.in b/configure.in
index 7102f10..7910b2b 100644
--- a/configure.in
+++ b/configure.in
@@ -2820,6 +2820,35 @@ freebsd*)
     SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
     ;;
 
+kfreebsd*)
+    COM=GCC
+    GUI=UNX
+    GUIBASE=unx
+    OS=LINUX
+
+    case "$host_cpu" in
+
+    i*86)
+        CPU=I
+        CPUNAME=INTEL
+        OUTPATH=unxkfgi6
+        ;;
+    x86_64)
+        CPU=X
+        CPUNAME=X86_64
+        LIB64="lib64"
+        OUTPATH=unxkfgx6
+        ;;
+    *)
+        AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+        ;;
+    esac
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    ;;
+
 linux-gnu*)
     COM=GCC
     GUI=UNX