If x11.pc doesn't exist then try a fallback. Fixes #492022

2007-10-31  William Jon McCann  <mccann@jhu.edu>

	* configure.ac:
	* daemon/Makefile.am:
	If x11.pc doesn't exist then try a fallback.
	Fixes #492022


svn path=/trunk/; revision=5478

ChangeLog

+2007-10-31  William Jon McCann  <mccann@jhu.edu>
+
+	* configure.ac:
+	* daemon/Makefile.am:
+	If x11.pc doesn't exist then try a fallback.
+	Fixes #492022
+
 2007-10-31  William Jon McCann  <mccann@jhu.edu>
 
 	* daemon/gdm-session-direct.c: (gdm_session_direct_start_session):

configure.ac

@@ -39,7 +39,6 @@ dnl ---------------------------------------------------------------------------
 dnl - Dependencies
 dnl ---------------------------------------------------------------------------
 
-X11_REQUIRED_VERSION=1.0.0
 DBUS_GLIB_REQUIRED_VERSION=0.74
 GLIB_REQUIRED_VERSION=2.13.0
 GTK_REQUIRED_VERSION=2.10.0
@@ -61,11 +60,21 @@ AC_SUBST(COMMON_LIBS)
 PKG_CHECK_MODULES(DAEMON,
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-        x11 >= $X11_REQUIRED_VERSION
 )
 AC_SUBST(DAEMON_CFLAGS)
 AC_SUBST(DAEMON_LIBS)
 
+PKG_CHECK_MODULES(XLIB, x11, ,
+  [AC_PATH_XTRA
+    if test "x$no_x" = xyes; then
+      AC_MSG_ERROR("no (requires X development libraries)")
+    else
+      XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+      XLIB_CFLAGS=$X_CFLAGS
+    fi])
+AC_SUBST(XLIB_CFLAGS)
+AC_SUBST(XLIB_LIBS)
+
 PKG_CHECK_MODULES(GTK,
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
 )

daemon/Makefile.am

@@ -21,6 +21,7 @@ INCLUDES = \
 	-DGDM_OLD_CONF=\"$(GDM_OLD_CONF)\"		\
 	$(DISABLE_DEPRECATED_CFLAGS)			\
 	$(DAEMON_CFLAGS)				\
+	$(XLIB_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DEBUG_CFLAGS)					\
 	-DLANG_CONFIG_FILE=\"$(LANG_CONFIG_FILE)\"	\
@@ -79,6 +80,7 @@ test_session_SOURCES = 		\
 	$(NULL)
 
 test_session_LDADD =		\
+	$(XLIB_LIBS)		\
 	$(DAEMON_LIBS)		\
 	$(PAM_LIBS)		\
 	$(top_builddir)/common/libgdmcommon.la	\
@@ -123,6 +125,7 @@ gdm_simple_slave_LDFLAGS =		\
 	$(NULL)
 
 gdm_simple_slave_LDADD = 			\
+	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(EXTRA_DAEMON_LIBS)                    \
 	$(top_builddir)/common/libgdmcommon.la	\
@@ -154,6 +157,7 @@ gdm_factory_slave_LDFLAGS =		\
 	$(NULL)
 
 gdm_factory_slave_LDADD = 			\
+	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
@@ -186,6 +190,7 @@ gdm_product_slave_LDFLAGS =		\
 	$(NULL)
 
 gdm_product_slave_LDADD = 			\
+	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(EXTRA_DAEMON_LIBS)                    \
 	$(top_builddir)/common/libgdmcommon.la	\
@@ -261,6 +266,7 @@ gdm_binary_LDFLAGS =				\
 	$(NULL)
 
 gdm_binary_LDADD = \
+	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(XDMCP_LIBS)                           \
 	$(LIBWRAP_LIBS)                         \