Author: benny
Date: 2007-02-12 18:24:19 +0000 (Mon, 12 Feb 2007)
New Revision: 24959
Modified:
terminal/trunk/ChangeLog
terminal/trunk/configure.in.in
terminal/trunk/terminal/Makefile.am
terminal/trunk/terminal/terminal-shortcut-editor.c
Log:
2007-02-12 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in, terminal/terminal-shortcut-editor.c,
terminal/Makefile.am: Link to -lx11. Bug #2870.
Modified: terminal/trunk/ChangeLog
===================================================================
--- terminal/trunk/ChangeLog 2007-02-12 18:16:29 UTC (rev 24958)
+++ terminal/trunk/ChangeLog 2007-02-12 18:24:19 UTC (rev 24959)
@@ -1,5 +1,10 @@
2007-02-12 Benedikt Meurer <[EMAIL PROTECTED]>
+ * configure.in.in, terminal/terminal-shortcut-editor.c,
+ terminal/Makefile.am: Link to -lx11. Bug #2870.
+
+2007-02-12 Benedikt Meurer <[EMAIL PROTECTED]>
+
* terminal/terminal-dbus.c: Apply Brian's patch to fix invalid
variable type for user id. Bug #2898.
Modified: terminal/trunk/configure.in.in
===================================================================
--- terminal/trunk/configure.in.in 2007-02-12 18:16:29 UTC (rev 24958)
+++ terminal/trunk/configure.in.in 2007-02-12 18:24:19 UTC (rev 24959)
@@ -72,6 +72,11 @@
dnl ******************************
XDT_I18N([EMAIL PROTECTED]@])
+dnl ********************************
+dnl *** Check for X11 (optional) ***
+dnl ********************************
+XDT_CHECK_LIBX11()
+
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
Modified: terminal/trunk/terminal/Makefile.am
===================================================================
--- terminal/trunk/terminal/Makefile.am 2007-02-12 18:16:29 UTC (rev 24958)
+++ terminal/trunk/terminal/Makefile.am 2007-02-12 18:24:19 UTC (rev 24959)
@@ -72,6 +72,7 @@
$(EXO_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSTARTUP_NOTIFICATION_CFLAGS) \
+ $(LIBX11_CFLAGS) \
$(VTE_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -81,6 +82,8 @@
$(EXO_LIBS) \
$(GTK_LIBS) \
$(LIBSTARTUP_NOTIFICATION_LIBS) \
+ $(LIBX11_LDFLAGS) \
+ $(LIBX11_LIBS) \
$(VTE_LIBS) \
$(TERMINAL_LIBS)
Modified: terminal/trunk/terminal/terminal-shortcut-editor.c
===================================================================
--- terminal/trunk/terminal/terminal-shortcut-editor.c 2007-02-12 18:16:29 UTC
(rev 24958)
+++ terminal/trunk/terminal/terminal-shortcut-editor.c 2007-02-12 18:24:19 UTC
(rev 24959)
@@ -280,7 +280,7 @@
default:
return FALSE;
}
-#elif defined(GDK_WINDOWING_X11)
+#elif (defined(GDK_WINDOWING_X11) && defined(HAVE_LIBX11))
XModifierKeymap *keymap;
gboolean result = FALSE;
gint n;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
