[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#556694: FTBFS with binutils-gold



Here is a patch to configure.ac to make it pull in the needed libraries.
Note that the selinux check must be moved, otherwise PKG_CHECK_MODULES
skips setting XDM_LIBS entirely; as an alternative, you could have it
set some other variable than XDM_LIBS and merge it in later.
--- a/configure.ac
+++ b/configure.ac
@@ -131,23 +131,6 @@
 		 fi])
 fi
 
-use_selinux_default=no
-# Check for selinux support
-AC_ARG_WITH(selinux, AC_HELP_STRING([--with-selinux],[Add support for selinux]),
-	[USE_SELINUX=$withval], [USE_SELINUX=$use_selinux_default])
-if test "x$USE_SELINUX" != "xno" ; then
-   	old_LIBS="$LIBS"
-	LIBS=""
-	AC_SEARCH_LIBS(is_selinux_enabled,[selinux])
-	AC_CHECK_FUNC(is_selinux_enabled,
-		[AC_DEFINE(HAVE_SELINUX,1,[Add support for selinux])],
-		[if test "x$USE_SELINUX" != "xtry" ; then
-			AC_MSG_ERROR(["selinux support requested, but is_selinux_enabled not found."])
-		 fi])
-	XDM_LIBS="$XDM_LIBS $LIBS"
-	LIBS="$old_LIBS"
-fi
-
 # FIXME: Find better test for which OS'es use su -m  - for now, just try to
 # mirror the Imakefile setting of:
 # if  defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
@@ -309,7 +292,7 @@
 
 # Checks for pkg-config packages
 
-PKG_CHECK_MODULES(XDM, xmu x11 xau)
+PKG_CHECK_MODULES(XDM, xmu x11 xext xrender xau)
 
 XDM_LIBS="$XDM_LIBS $XDM_OS_LIBS"
 
@@ -325,6 +308,23 @@
 	GREETER_LIBS="$GREETER_LIBS $XINERAMA_LIBS"
 ])
 
+use_selinux_default=no
+# Check for selinux support
+AC_ARG_WITH(selinux, AC_HELP_STRING([--with-selinux],[Add support for selinux]),
+	[USE_SELINUX=$withval], [USE_SELINUX=$use_selinux_default])
+if test "x$USE_SELINUX" != "xno" ; then
+   	old_LIBS="$LIBS"
+	LIBS=""
+	AC_SEARCH_LIBS(is_selinux_enabled,[selinux])
+	AC_CHECK_FUNC(is_selinux_enabled,
+		[AC_DEFINE(HAVE_SELINUX,1,[Add support for selinux])],
+		[if test "x$USE_SELINUX" != "xtry" ; then
+			AC_MSG_ERROR(["selinux support requested, but is_selinux_enabled not found."])
+		 fi])
+	XDM_LIBS="$XDM_LIBS $LIBS"
+	LIBS="$old_LIBS"
+fi
+
 # Xft text drawing for the greeter screen
 AC_ARG_WITH(xft, 
     	AC_HELP_STRING([--with-xft], 
@@ -379,7 +379,7 @@
 
 PKG_CHECK_MODULES(XDM_PRINT, xaw7)
 PKG_CHECK_MODULES(DMCP, xdmcp)
-PKG_CHECK_MODULES(XLIB, x11)
+PKG_CHECK_MODULES(XLIB, x11 xext)
 PKG_CHECK_MODULES(AUTH, xau)
 
 #

Reply to: