maemo display name added

[cpumem-applet] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8dfab45..e8b1161 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(maemo5-load-applet, 0.5)
+AM_INIT_AUTOMAKE(cpumem-applet, 0.1-1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -16,7 +16,7 @@ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations"
 
 AC_SUBST(CFLAGS)
 
-PKG_CHECK_MODULES([MAEMO5_LOADAPPLET], [
+PKG_CHECK_MODULES([CPUMEM_APPLET], [
        gtk+-2.0 >= 2.4.0
        glib-2.0 >= 2.2.0
        hildon-1 >= 1.0.9
@@ -24,8 +24,8 @@ PKG_CHECK_MODULES([MAEMO5_LOADAPPLET], [
        libhildondesktop-1 >= 2.1.0
 ])  
                            
-AC_SUBST(MAEMO5_LOADAPPLET)
-AC_SUBST(MAEMO5_LOADAPPLET_CFLAGS)
+AC_SUBST(CPUMEM_APPLET)
+AC_SUBST(CPUMEM_APPLET_CFLAGS)
 
 hildondesktoplibdir="${libdir}/hildon-desktop"
 AC_SUBST(hildondesktoplibdir)
@@ -33,64 +33,9 @@ AC_SUBST(hildondesktoplibdir)
 hildondesktoplibdir="${libdir}/hildon-desktop"
 AC_SUBST(hildondesktoplibdir)
 
-
-
-AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
-if test "x$HAVE_X" = "xno"
-  then
-    AC_MSG_NOTICE([cannot find X11 development files])
-  else
-    dnl this is much more than we want
-    X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
-    dnl AC_PATH_XTRA only defines the path needed to find the X libs,
-    dnl it does not add the libs; therefore we add them here
-    X_LIBS="$X_LIBS -lX11"
-    AC_SUBST(X_CFLAGS)
-    AC_SUBST(X_LIBS)
-
-    dnl check for Xfixes
-    PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no")
-    if test "x$HAVE_XFIXES" = "xyes"
-    then
-        XFIXES_CFLAGS="-DHAVE_XFIXES $XFIXES_CFLAGS"
-    fi
-    AC_SUBST(XFIXES_LIBS)
-    AC_SUBST(XFIXES_CFLAGS)
-
-    dnl check for Xdamage
-    PKG_CHECK_MODULES(XDAMAGE, xdamage, HAVE_XDAMAGE="yes", HAVE_XDAMAGE="no")
-    if test "x$HAVE_XDAMAGE" = "xyes"
-    then
-        XDAMAGE_CFLAGS="-DHAVE_XDAMAGE $XDAMAGE_CFLAGS"
-    fi
-    AC_SUBST(XDAMAGE_LIBS)
-    AC_SUBST(XDAMAGE_CFLAGS)
-  fi
-
-dnl check for GST BASE flags
-PKG_CHECK_MODULES(GSTREAMERBASE, gstreamer-base-0.10, HAVE_GSTREAMERBASE="yes", HAVE_GSTREAMERBASE="no")
-AC_SUBST(GSTREAMERBASE_LIBS)
-AC_SUBST(GSTREAMERBASE_CFLAGS)
-
-dnl check for GST flags
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no")
-AC_SUBST(GSTREAMER_LIBS)
-AC_SUBST(GSTREAMER_CFLAGS)
-
-GST_LICENSE="LGPL"
-AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
-AC_SUBST(GST_LICENSE)
-
-
-
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' -no-undefined"
-AC_SUBST(GST_PLUGIN_LDFLAGS)
-
-
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
        data/Makefile
-       gst/Makefile
 ]) 
 AC_OUTPUT