Include the device filter XML in the AAR

[sigrok-androidutils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 20bc6f8cb1e540bf03052a5967ed4a7d8fafbfee..7d1bce8578f8a310c4525b4cc3e8b2b99e7225fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,22 +17,24 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_INIT([sigrok-androidutils], [0.1.0])
+AC_INIT([sigrok-androidutils], [0.1.0], [sigrok-devel@lists.sourceforge.net],
+       [sigrok-androidutils], [http://www.sigrok.org])
 
 AC_CONFIG_SRCDIR([src/org/sigrok/androidutils/UsbHelper.java])
 
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AC_ARG_WITH([android-sdk],
        [AS_HELP_STRING([--with-android-sdk],
-         [specify path to android SDK @<:@default=/usr/local/android@:>@])],
+         [specify path to Android SDK @<:@default=/usr/local/android@:>@])],
        [ANDROID_SDK="$withval"],
        [ANDROID_SDK=/usr/local/android])
 
 AC_ARG_WITH([android-platform],
        [AS_HELP_STRING([--with-android-platform],
-         [select android platform to build for @<:@default=android-14@:>@])],
+         [select Android platform to build for @<:@default=android-14@:>@])],
        [ANDROID_PLATFORM="$withval"],
        [ANDROID_PLATFORM=android-14])
 
@@ -40,7 +42,12 @@ LT_INIT
 AC_PROG_CXX
 AM_PROG_CC_C_O
 
+PKG_CHECK_MODULES([LIBSIGROKCXX], [libsigrokcxx], [
+       LIBSIGROKCXX_VERSION=`$PKG_CONFIG --modversion "libsigrokcxx" 2>&AS_MESSAGE_LOG_FD`
+])
+
 AC_SUBST([ANDROID_SDK])
 AC_SUBST([ANDROID_PLATFORM])
+AC_SUBST([LIBSIGROKCXX_VERSION])
 
 AC_OUTPUT([Makefile lib/libsigrokandroidutils.pc])