[Goodies-commits] r2337 - in notification-daemon-xfce/trunk: . src/daemon
Nick Schermer
nick at xfce.org
Thu Jan 11 20:17:30 CET 2007
Author: nick
Date: 2007-01-11 19:17:30 +0000 (Thu, 11 Jan 2007)
New Revision: 2337
Modified:
notification-daemon-xfce/trunk/ChangeLog
notification-daemon-xfce/trunk/configure.in.in
notification-daemon-xfce/trunk/src/daemon/Makefile.am
notification-daemon-xfce/trunk/src/daemon/daemon.c
Log:
Improve the configure and makefiles a bit.
Modified: notification-daemon-xfce/trunk/ChangeLog
===================================================================
--- notification-daemon-xfce/trunk/ChangeLog 2007-01-11 18:45:21 UTC (rev 2336)
+++ notification-daemon-xfce/trunk/ChangeLog 2007-01-11 19:17:30 UTC (rev 2337)
@@ -1,8 +1,14 @@
2007-01-11 Nick Schermer <nick at xfce.org>
+
+ * Improve the configure and makefiles a bit.
+
+2007-01-11 Nick Schermer <nick at xfce.org>
+
* Sync changes from the notification-trunk up to
revision 2959.
2006-10-22 Nick Schermer <nick at xfce.org>
+
* Reorganize the directory structure, all code is now
located in src/.
* Fix typo in Makefile.am, reported by James Westby
Modified: notification-daemon-xfce/trunk/configure.in.in
===================================================================
--- notification-daemon-xfce/trunk/configure.in.in 2007-01-11 18:45:21 UTC (rev 2336)
+++ notification-daemon-xfce/trunk/configure.in.in 2007-01-11 19:17:30 UTC (rev 2337)
@@ -1,22 +1,24 @@
dnl $Id$
dnl
dnl Copyright 2006 Christian Hammond
-dnl Ported to Xfce created by Nick Schermer <nick at xfce.org>
+dnl Ported to Xfce by Nick Schermer <nick at xfce.org>
dnl
dnl ********************
dnl *** version info ***
dnl ********************
-m4_define([notification_daemon_major_version], [0])
-m4_define([notification_daemon_minor_version], [3])
-m4_define([notification_daemon_micro_version], [6])
+m4_define([notification_daemon_version_major], [0])
+m4_define([notification_daemon_version_minor], [3])
+m4_define([notification_daemon_version_micro], [7])
+m4_define([notification_daemon_version_build], [r at REVISION@])
+m4_define([notification_daemon_version_tag], [svn])
-m4_define([notification_daemon_version], [notification_daemon_major_version().notification_daemon_minor_version().notification_daemon_micro_version()])
+m4_define([notification_daemon_version], [notification_daemon_version_major().notification_daemon_version_minor().notification_daemon_version_micro()ifelse(notification_daemon_version_tag(), [svn], [notification_daemon_version_tag()-notification_daemon_version_build()], [notification_daemon_version_tag()])])
dnl *********************
dnl *** init autoconf ***
dnl *********************
-AC_INIT([notification-daemon-xfce], [notification_daemon_version()], [goodies-dev at xfce.org])
+AC_INIT([notification-daemon-xfce], [notification_daemon_version()], [http://bugzilla.xfce.org/])
AC_PREREQ([2.50])
dnl *********************
@@ -29,17 +31,17 @@
dnl ********************************
dnl *** check for basic programs ***
dnl ********************************
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+AC_PROG_CC()
+AC_PROG_INSTALL()
+AC_PROG_LIBTOOL()
AC_PROG_INTLTOOL()
dnl ***************************
dnl *** version information ***
dnl ***************************
-NOTIFICATION_DAEMON_MAJOR_VERSION=notification_daemon_major_version()
-NOTIFICATION_DAEMON_MINOR_VERSION=notification_daemon_minor_version()
-NOTIFICATION_DAEMON_MICRO_VERSION=notification_daemon_micro_version()
+NOTIFICATION_DAEMON_MAJOR_VERSION=notification_daemon_version_major()
+NOTIFICATION_DAEMON_MINOR_VERSION=notification_daemon_version_minor()
+NOTIFICATION_DAEMON_MICRO_VERSION=notification_daemon_version_micro()
AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MAJOR_VERSION, $NOTIFICATION_DAEMON_MAJOR_VERSION, [Major])
AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MINOR_VERSION, $NOTIFICATION_DAEMON_MINOR_VERSION, [Minor])
AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MICRO_VERSION, $NOTIFICATION_DAEMON_MICRO_VERSION, [Micro])
@@ -47,7 +49,8 @@
dnl ***************************************
dnl *** check for standard header files ***
dnl ***************************************
-AC_HEADER_STDC
+AC_HEADER_STDC()
+AC_CHECK_HEADERS([stdlib.h errno.h string.h stdio.h])
dnl ******************************
dnl *** check for i18n support ***
@@ -105,3 +108,23 @@
icons/22x22/Makefile
icons/48x48/Makefile
])
+
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+if test x"$XFCE_MCS_MANAGER_FOUND" = x"yes"; then
+echo "* Xfce Settings Manager Wrapper: yes"
+else
+echo "* Xfce Settings Manager Wrapper: no"
+fi
+if test x"$LIBNOTIFY_FOUND" = x"yes"; then
+echo "* Preview in Settings Dialog: yes"
+else
+echo "* Preview in Settings Dialog: no"
+fi
+echo "* Show Close Button: $ac_enable_close_button"
+echo "* Debug Support: $enable_debug"
+echo
Modified: notification-daemon-xfce/trunk/src/daemon/Makefile.am
===================================================================
--- notification-daemon-xfce/trunk/src/daemon/Makefile.am 2007-01-11 18:45:21 UTC (rev 2336)
+++ notification-daemon-xfce/trunk/src/daemon/Makefile.am 2007-01-11 19:17:30 UTC (rev 2337)
@@ -1,5 +1,11 @@
# $Id$
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DDBUS_API_SUBJECT_TO_CHANGE \
+ -DG_LOG_DOMAIN=\"notification-daemon-xfce\" \
+ -DENGINES_DIR=\"$(libdir)/notification-daemon-xfce-1.0/engines\"
+
libexec_PROGRAMS = \
notification-daemon-xfce
@@ -11,6 +17,14 @@
stack.c \
stack.h
+notification_daemon_xfce_CFLAGS = \
+ $(GTK_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE$UTIL_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS)
+
+
notification_daemon_xfce_LDADD = \
$(GTK_LIBS) \
$(LIBXFCEGUI4_LIBS) \
@@ -27,16 +41,6 @@
--prefix=notification_daemon_xfce \
$(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
-INCLUDES = \
- -I$(top_srcdir) \
- -DDBUS_API_SUBJECT_TO_CHANGE \
- $(GTK_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS) \
- $(LIBXFCE$UTIL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- -DENGINES_DIR=\"$(libdir)/notification-daemon-xfce-1.0/engines\"
-
EXTRA_DIST = \
notificationdaemon.xml
Modified: notification-daemon-xfce/trunk/src/daemon/daemon.c
===================================================================
--- notification-daemon-xfce/trunk/src/daemon/daemon.c 2007-01-11 18:45:21 UTC (rev 2336)
+++ notification-daemon-xfce/trunk/src/daemon/daemon.c 2007-01-11 19:17:30 UTC (rev 2337)
@@ -1088,8 +1088,12 @@
DBusGProxy *bus_proxy;
GError *error;
guint request_name_result;
+
+ g_set_application_name ("notification-daemon-xfce");
+#ifdef G_ENABLE_DEBUG
g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
+#endif
gtk_init(&argc, &argv);
More information about the Goodies-commits
mailing list