tomboy r1910 - in trunk: . libtomboy
- From: sdroege svn gnome org
- To: svn-commits-list gnome org
- Subject: tomboy r1910 - in trunk: . libtomboy
- Date: Thu, 28 Feb 2008 15:36:50 +0000 (GMT)
Author: sdroege
Date: Thu Feb 28 15:36:50 2008
New Revision: 1910
URL: http://svn.gnome.org/viewvc/tomboy?rev=1910&view=rev
Log:
* configure.in:
* libtomboy/Makefile.am: Check for X11 libraries and headers and
actually link with them. This was done only indirectly through Gtk
before. Fixes bug #501524.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/libtomboy/Makefile.am
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Feb 28 15:36:50 2008
@@ -199,6 +199,36 @@
AC_SUBST(CSC_DEFINES)
#
+# Check for X11 libraries
+#
+
+ac_cflags_save="$CFLAGS"
+ac_cppflags_save="$CPPFLAGS"
+AC_PATH_XTRA
+CFLAGS="$CFLAGS $X_CFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+dnl now try to find the HEADER
+AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
+
+if test "x$HAVE_X" = "xno"
+then
+ AC_MSG_ERROR([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)
+fi
+AC_SUBST(HAVE_X)
+
+CFLAGS="$ac_cflags_save"
+CPPFLAGS="$ac_cppflags_save"
+
+#
# Replace xgettext by our PluginInfo aware wrapper script
#
XGETTEXT_XCOMMENT=`echo 'Test("1")' |\
Modified: trunk/libtomboy/Makefile.am
==============================================================================
--- trunk/libtomboy/Makefile.am (original)
+++ trunk/libtomboy/Makefile.am Thu Feb 28 15:36:50 2008
@@ -23,8 +23,9 @@
eggtrayicon.h \
eggtrayicon.c
+libtomboy_la_CFLAGS = $(X_CFLAGS)
libtomboy_la_LDFLAGS = -export-dynamic -module -avoid-version
-libtomboy_la_LIBADD = $(LIBTOMBOY_LIBS) $(LIBM)
+libtomboy_la_LIBADD = $(LIBTOMBOY_LIBS) $(X_LIBS) $(LIBM)
maintainer-clean-local:
rm -f Makefile.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]