X-Git-Url: http://git.maemo.org/git/?p=sharing-cli;a=blobdiff_plain;f=configure.ac;h=88c338b65077399a6fc07a6c5cf548420d7e6b8a;hp=3bf0ed2ba09b0e48acb15e99c9c38f05da890ab9;hb=HEAD;hpb=3419a53b563d0cce238372985421a83504680760

diff --git a/configure.ac b/configure.ac
index 3bf0ed2..88c338b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sharing-plugin-template], [0.1])
+AC_INIT([sharing-cli], [0.4.1])
 AM_INIT_AUTOMAKE([foreign])
 
 AM_MAINTAINER_MODE
@@ -13,7 +13,6 @@ AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 AC_ISC_POSIX
 AC_PROG_CXX
-AC_PROG_CPP
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
@@ -23,43 +22,15 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 
 
-dnl =======================================================
-dnl ===== Extra CFLAGS
-dnl =======================================================
-
-# -Wunreachable-code can't be used with library
-CFLAGS="$CFLAGS -pedantic-errors -Wall -Wmissing-prototypes -Wcast-align -std=c99"
-
-# set -fgnu89-inline for GCC4 compilers
-if test -z "$ac_cv_prog_CC"; then
-  configure_gcc="$CC"
-else
-  configure_gcc="$ac_cv_prog_CC"
-fi
-if $configure_gcc --version | sed -e 's,\..*,.,' -e q | grep -q 4.$ ; then
-  CFLAGS="$CFLAGS -fgnu89-inline"
-fi
-
+CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wcast-align -std=gnu99"
 
-dnl =======================================================
-dnl ===== Checks for libraries
-dnl =======================================================
 
-dnl PKG_CHECK_MODULES(PACKAGE, [glib-2.0 gtk+-2.0 libsharing conic libosso])
-PKG_CHECK_MODULES(PACKAGE, [glib-2.0 gtk+-2.0 libsharing conic])
+PKG_CHECK_MODULES(PACKAGE, [glib-2.0 gtk+-2.0 libsharing conic hildon-1 libosso])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-dnl = Check that we have libsharing ============================================
 PKG_CHECK_MODULES(SHARING, libsharing)
 
-
-dnl =======================================================
-dnl ===== Checks for dirs
-dnl =======================================================
-
-currentdir=`pwd`
-AC_SUBST(currentdir)
 pluginsdir=`$PKG_CONFIG libsharing --variable=pluginsdir`
 AC_SUBST(pluginsdir)
 PKG_PROG_PKG_CONFIG()
@@ -67,10 +38,6 @@ servicesdir=`$PKG_CONFIG libsharing --variable=servicesdir`
 AC_SUBST(servicesdir)
 
 
-dnl =======================================================
-dnl ===== Debug messages
-dnl =======================================================
-
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Turn on debug messages]),
         enable_debug=yes, enable_debug=no)
 
@@ -80,10 +47,6 @@ if test x$enable_debug = xyes; then
 fi
 
 
-dnl =======================================================
-dnl ===== Localisation
-dnl =======================================================
-
 dnl Set PACKAGE_LOCALE_DIR in config.h
 DATADIRNAME="share"
 if test "x${prefix}" = "xNONE"; then
@@ -93,15 +56,10 @@ else
 fi
 AC_SUBST(PACKAGE_LOCALE_DIR)
 
-
-dnl =======================================================
-dnl ===== Creating output files
-dnl =======================================================
-
 AC_OUTPUT([
     Makefile
     data/Makefile
-    data/template.service.xml
+    data/sharing-cli.service.xml
     src/Makefile
 ])