prepare 0.3 release

[azimuth] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1aec2cc..f6488ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(publish-position, 0.1)
+AC_INIT(publish-position, 0.3)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
@@ -21,16 +21,30 @@ PKG_CHECK_MODULES(LOCATION, liblocation)
 AC_SUBST(LOCATION_LIBS)
 AC_SUBST(LOCATION_CFLAGS)
 
-PKG_CHECK_MODULES(HILDON, hildon-1)
+PKG_CHECK_MODULES(OSSO, libosso >= 1.0.0)
+AC_SUBST(OSSO_LIBS)
+AC_SUBST(OSSO_CFLAGS)
+
+PKG_CHECK_MODULES(HILDON, hildon-1 hildon-control-panel >= 0.10.0)
 AC_SUBST(HILDON_LIBS)
 AC_SUBST(HILDON_CFLAGS)
 
+PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6)
+AC_SUBST(GCONF_LIBS)
+AC_SUBST(GCONF_CFLAGS)
+AM_GCONF_SOURCE_2
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+
+PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.23.4)
+AC_SUBST(DBUSGLIB_LIBS)
+AC_SUBST(DBUSGLIB_CFLAGS)
+
 dnl Localization
 GETTEXT_PACKAGE=publish-position
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "${GETTEXT_PACKAGE}", [gettext package])
 
-ERROR_CFLAGS="-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wdeclaration-after-statement -Wshadow -Wmissing-prototypes -Wmissing-declarations"
+ERROR_CFLAGS="-Wall -Wno-missing-field-initializers -Wno-unused-parameter -Wdeclaration-after-statement -Wshadow -Wmissing-prototypes -Wmissing-declarations"
 
 AC_ARG_ENABLE(Werror,
   AC_HELP_STRING([--disable-Werror],[compile without -Werror (normally enabled in development builds)]),
@@ -45,8 +59,20 @@ AC_SUBST(ERROR_CFLAGS)
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
+# Application icon install directories
+icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
+icon_34x34dir=$datadir/icons/hicolor/34x34/hildon
+icon_40x40dir=$datadir/icons/hicolor/40x40/hildon
+icon_50x50dir=$datadir/icons/hicolor/50x50/hildon
+icon_scalabledir=$datadir/icons/hicolor/scalable/hildon
+
 servicedir=`$PKG_CONFIG dbus-1 --variable=session_bus_services_dir`
 AC_SUBST(servicedir)
+AC_SUBST(icon_26x26dir)
+AC_SUBST(icon_34x34dir)
+AC_SUBST(icon_40x40dir)
+AC_SUBST(icon_50x50dir)
+AC_SUBST(icon_scalabledir)
 
 AC_CHECK_PROGS([XSLTPROC], [xsltproc])
 if test -z "$XSLTPROC"; then
@@ -59,6 +85,12 @@ AC_SUBST(HILDON_HOME_DESKTOP_DIR)
 HILDON_DESKTOP_LIB_DIR=`pkg-config libhildondesktop-1 --variable=hildondesktoplibdir`
 AC_SUBST(HILDON_DESKTOP_LIB_DIR)
 
+hildoncpdesktopentrydir=`$PKG_CONFIG --variable=plugindesktopentrydir hildon-control-panel`
+AC_SUBST(hildoncpdesktopentrydir)
+
+cpazimuthdir=`$PKG_CONFIG --variable=pluginlibdir hildon-control-panel`
+AC_SUBST(cpazimuthdir)
+
 AC_ARG_ENABLE(cast-checks,  [  --disable-cast-checks   compile with GLIB cast checks disabled],[cchecks=${enableval}],cchecks=yes)
 if test "x$cchecks" = "xno"; then
     CFLAGS="$CFLAGS -DG_DISABLE_CAST_CHECKS"
@@ -82,4 +114,7 @@ fi
 AC_OUTPUT([
        Makefile
        src/Makefile
+       data/Makefile
+       data/azimuth.schemas
+       data/cpazimuth.desktop
 ])