r1982 - in trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup: . src

stefan at sita.openmoko.org stefan at sita.openmoko.org
Wed May 16 22:58:25 CEST 2007


Author: stefan
Date: 2007-05-16 22:58:24 +0200 (Wed, 16 May 2007)
New Revision: 1982

Modified:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/configure.ac
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/Makefile.am
Log:
Adjust dependencies for libstartup-notification


Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/configure.ac	2007-05-16 20:09:43 UTC (rev 1981)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/configure.ac	2007-05-16 20:58:24 UTC (rev 1982)
@@ -14,9 +14,15 @@
 PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
                  AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
 
-LIBS="$LIBS $OPENMOKO_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS" 
+PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0, ,
+                 AC_MSG_ERROR([*** Required Startup Notification library not installed ***]))
 
+#AC_SUBST(SN_LIBS)
+#AC_SUBST(SN_CFLAGS)
+
+LIBS="$LIBS $OPENMOKO_LIBS $LIBSN_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBSN_CFLAGS$"
+
 # output stuff
 AC_OUTPUT([
 Makefile

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/Makefile.am	2007-05-16 20:09:43 UTC (rev 1981)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/Makefile.am	2007-05-16 20:58:24 UTC (rev 1982)
@@ -1,11 +1,11 @@
 AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
-AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@ @SN_CFLAGS@
+AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@ @LIBSN_CFLAGS@
 
 appletdir = $(libdir)/matchbox-panel/
 applet_LTLIBRARIES = libopenmoko-panel-startup.la
 
 libopenmoko_panel_startup_la_SOURCES = openmoko-panel-startup.c
-libopenmoko_panel_startup_la_LIBADD = @OPENMOKO_LIBS@ @SN_LIBS@
+libopenmoko_panel_startup_la_LIBADD = @OPENMOKO_LIBS@ @LIBSN_LIBS@
 
 MAINTAINERCLEANFILES = Makefile.in
 





More information about the commitlog mailing list