[Xfce4-commits] <libxfce4ui:master> Show SM support in build config and use FLAGS.

[Nick Schermer]

Updating branch refs/heads/master
         to 59ea7ee2ece9dda65b2b1c119da1c0fd567a6888 (commit)
       from 817c1dbfb9061bac740ad6a60fe676872a0b7960 (commit)

commit 59ea7ee2ece9dda65b2b1c119da1c0fd567a6888
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Oct 19 14:39:40 2009 +0200

    Show SM support in build config and use FLAGS.

 configure.in.in        |   14 ++++++++------
 libxfce4ui/Makefile.am |    3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index f8a7a69..5e53f84 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -253,18 +253,20 @@ echo "  - Pixmap directory:        $GLADEUI_PIXMAPDIR"
 else
 echo "* Glade Interface Designer:  no"
 fi
-echo
 if test x"$enable_keyboard_library" = x"yes"; then
 echo "* Keyboard library support:  yes"
 else
 echo "* Keyboard library support:  no"
 fi
-echo
 if test x"$LIBSTARTUP_NOTIFICATION_FOUND" = x"yes"; then
-echo "* Startup Notification:      yes"
+echo "* Startup notification:      yes"
 else
-echo "* Startup Notification:      no"
+echo "* Startup notification:      no"
 fi
-echo
-echo "* Debug Support:             $enable_debug"
+if test x"$LIBSM_LIBS" = x""; then
+echo "* X11 session management:    no"
+else
+echo "* X11 session management:    yes"
+fi
+echo "* Debug support:             $enable_debug"
 echo
diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index a208b83..eb2ede0 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -54,6 +54,7 @@ libxfce4ui_1_la_SOURCES = \
 	xfce-titled-dialog.c
 
 libxfce4ui_1_la_CFLAGS = \
+	$(LIBSM_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(LIBSTARTUP_NOTIFICATION_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
@@ -63,9 +64,11 @@ libxfce4ui_1_la_LDFLAGS = \
 	-version-info $(LIBXFCE4UI_VERINFO) \
 	-export-symbols-regex "^[^_].*" \
 	-no-undefined \
+	$(LIBSM_LDFLAGS) \
 	$(PLATFORM_LDFLAGS)
 
 libxfce4ui_1_la_LIBADD = \
+	$(LIBSM_LIBS) \
 	$(GTK_LIBS) \
 	$(LIBSTARTUP_NOTIFICATION_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)