[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental configure.ac

[Miklos Vajna]

 android/experimental/LOAndroid3/AndroidManifest.xml.in |    2 -
 configure.ac                                           |   22 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 348bd4d2ab51e173738d7a299c4415f5f13ef401
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jan 19 15:13:51 2015 +0100

    android: make package name configurable
    
    Change-Id: I3897c551676bcb7d3237be3dde74123c5ddd8f84

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index 360687e..118555f 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.libreoffice"
+    package="@ANDROID_PACKAGE_NAME@"
     @ANDROID_INSTALL_LOCATION@
     android:versionCode="1"
     android:versionName="@ANDROID_VERSION@">
diff --git a/configure.ac b/configure.ac
index b147aa8..a700420 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2128,6 +2128,14 @@ AC_ARG_WITH(vendor,
     ],
 ,)
 
+AC_ARG_WITH(android-package-name,
+    AS_HELP_STRING([--with-android-package-name],
+        [Set Android package name of the build.])
+    [
+                          Usage:     --with-android-package-name="org.libreoffice"
+    ],
+,)
+
 AC_ARG_WITH(compat-oowrappers,
     AS_HELP_STRING([--with-compat-oowrappers],
         [Install oo* wrappers in parallel with
@@ -12302,6 +12310,20 @@ else
 fi
 AC_SUBST(OOO_VENDOR)
 
+if echo "$host_os" | grep -q linux-android ; then
+    ANDROID_PACKAGE_NAME=
+    AC_MSG_CHECKING([for Android package name])
+    if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then
+        ANDROID_PACKAGE_NAME="org.libreoffice"
+
+        AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_NAME])
+    else
+        ANDROID_PACKAGE_NAME="$with_android_package_name"
+        AC_MSG_RESULT([$ANDROID_PACKAGE_NAME])
+    fi
+    AC_SUBST(ANDROID_PACKAGE_NAME)
+fi
+
 AC_MSG_CHECKING([whether to install the compat oo* wrappers])
 if test "$with_compat_oowrappers" = "yes"; then
     WITH_COMPAT_OOWRAPPERS=TRUE