[gedit/gnome-2-28] Satisfy picky linker flags

[Paolo Borelli <pborelli src gnome org>]

commit ea4ed230d0d1dba34c5ee470f78c4ad3e60eac91
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Mar 23 00:08:02 2010 +0100

    Satisfy picky linker flags

 configure.ac |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a28ed12..748f7ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.59)
 
 m4_define(gedit_major_version,  2)
 m4_define(gedit_minor_version, 28)
-m4_define(gedit_micro_version,  3)
+m4_define(gedit_micro_version,  4)
 m4_define(gedit_version, gedit_major_version.gedit_minor_version.gedit_micro_version)
 
 AC_INIT(gedit, gedit_version, http://bugzilla.gnome.org/enter_bug.cgi?product=gedit)
@@ -50,6 +50,7 @@ AC_PROG_OBJC
 AC_SYS_LARGEFILE
 
 AC_CHECK_FUNCS(fsync)
+AC_CHECK_LIB(m, floor)
 
 dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
@@ -284,6 +285,22 @@ PKG_CHECK_MODULES(GEDIT, [
 	gconf-2.0 >= 1.1.11
 ])
 
+if test "$os_osx" = "no" &&
+   test "$os_win32" = "no"; then
+	PKG_CHECK_MODULES(X11, [
+		x11
+	])
+else
+	X11_CFLAGS=
+	X11_LIBS=
+fi
+
+GEDIT_CFLAGS="$GEDIT_CFLAGS $X11_CFLAGS"
+GEDIT_LIBS="$GEDIT_LIBS $X11_LIBS"
+
+AC_SUBST(GEDIT_CFLAGS)
+AC_SUBST(GEDIT_LIBS)
+
 dnl FIXME: Remove this when removing gedit-message-area
 
 if $PKG_CONFIG --atleast-version 2.17.1 gtk+-2.0; then