aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.in57
-rw-r--r--widgets/ChangeLog8
-rw-r--r--widgets/Makefile.am2
-rw-r--r--widgets/e-timezone-dialog/Makefile.am10
5 files changed, 76 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index e77526ac47..920da223e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-24 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #411619
+
+ * configure.in:
+ Add appropriate compiler and linker flags to e-util if GTK+
+ was built against X11.
+
2007-08-22 Wang Xin <jedy.wang@sun.com>
** Fix for bug #468804
diff --git a/configure.in b/configure.in
index d2669f79d8..73d9c157a2 100644
--- a/configure.in
+++ b/configure.in
@@ -1293,6 +1293,52 @@ case $CFLAGS in
;;
esac
+
+dnl **************************
+dnl Check for X libs and -lX11
+dnl **************************
+
+PKG_CHECK_MODULES(X, x11, :, [
+# pkg-config modules not found (only present since X11R7 aka Xorg); use
+# old-style detection
+AC_PATH_XTRA
+# X found
+if test x$no_x != xyes ; then
+ evolution_save_cflags="$CFLAGS"
+ evolution_save_libs="$LIBS"
+ CFLAGS="$X_CFLAGS"
+ LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+ AC_CHECK_LIB(X11, XFree, :, AC_MSG_ERROR([libX11 not found]))
+ CFLAGS="$evolution_save_cflags"
+ LIBS="$evolution_save_libs"
+ X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+fi
+])
+
+dnl *************************
+dnl Check for the Gtk backend
+dnl if it's X11, we -lX11
+dnl *************************
+
+evolution_save_cflags="$CFLAGS"
+# pull in the CFLAGS to locate gdkconfig.h
+CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+AC_COMPILE_IFELSE([
+#include <gdkconfig.h>
+
+int main(void) {
+#ifndef GDK_WINDOWING_X11
+#error GDK_WINDOWING_X11 not defined
+#endif
+ return 0;
+}
+],
+ GDK_BACKEND_X11=yes,
+ GDK_BACKEND_X11=no)
+
+CFLAGS="$evolution_save_cflags"
+
+
AM_PATH_ORBIT2(2.9.8)
AC_MSG_CHECKING(for CORBA include paths)
@@ -1388,7 +1434,16 @@ EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0)
AC_SUBST(E_NAME_CFLAGS)
AC_SUBST(E_NAME_LIBS)
-EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
+# If Gtk/Gdk is built against X11, e-util uses some
+# X11-specific code so link with X11.
+if test "x$GDK_BACKEND_X11" = "xyes"; then
+ E_UTIL_X11_CFLAGS="$X_CFLAGS"
+ E_UTIL_X11_LIBS="$X_LIBS"
+else
+ E_UTIL_X11_CFLAGS=""
+ E_UTIL_X11_LIBS=""
+fi
+EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
AC_SUBST(E_UTIL_CFLAGS)
AC_SUBST(E_UTIL_LIBS)
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 6d3ef0a618..5d3f295045 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-24 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #411619
+
+ * Makefile.am: Fix subdirectory order.
+
+ * e-timezone-dialog/Makefile.am: Remove WIN32_BOOTSTRAP_LIBS.
+
2007-08-23 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #309166
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 8be8fa19bf..3eb5ea06f7 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = \
- e-timezone-dialog \
table \
text \
misc \
+ e-timezone-dialog \
menus
EXTRA_DIST = \
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index cfddbeb914..4dcb2f014c 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la
-endif
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
@@ -18,9 +14,9 @@ libetimezonedialog_la_SOURCES = \
libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
-libetimezonedialog_la_LIBADD = \
- $(WIN32_BOOTSTRAP_LIBS) \
- $(top_builddir)/e-util/libeutil.la \
+libetimezonedialog_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_LIBS)
glade_DATA = e-timezone-dialog.glade