[ekiga/gnome-2-26] Fix build with binutils-gold

[Eugen Dedu <ededu src gnome org>]

commit 17f26fbe33ef8d873533801b1ed773cc0a27ed6f
Author: C.J. Adams-Collier <cjac colliertech org>
Date:   Sun May 30 23:16:33 2010 +0200

    Fix build with binutils-gold

 configure.ac        |    3 +++
 lib/Makefile.am     |    5 ++++-
 lib/gui/Makefile.am |    3 +++
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 33ec941..6ca2b61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,6 +434,8 @@ fi],enable_shm=yes)
     if test "x${with_shm}" != "xno"; then
       SHM="enabled"
       AC_DEFINE(HAVE_SHM,1,[SHM Support])
+      SHM_LIBS="-lXext"
+      AC_SUBST(SHM_LIBS)
     fi
   fi
 fi
@@ -896,6 +898,7 @@ fi
 echo "                    LDAP support  :  $LDAP"
 echo ""
 echo "                  XVideo support  :  $XV"
+echo "           Shared Memory support  :  $SHM"
 if test "x${gm_platform}" = "xmingw" ; then
 echo "                 DirectX support  :  $DX"
 fi
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7f85a24..004dacc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,9 +18,12 @@ BUILT_SOURCES = gmmarshallers.h gmmarshallers.c
 
 INCLUDES =						\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-I$(top_srcdir)					
+	-I$(top_srcdir)
 
 libekiga_la_LDFLAGS = -export-dynamic
+if !WIN32
+libekiga_la_LDFLAGS += -lX11
+endif
 libekiga_la_LIBADD = \
 	gmconf/libgmconf.la \
 	gui/libgmwidgets.la \
diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
index f0149b6..002cb2f 100644
--- a/lib/gui/Makefile.am
+++ b/lib/gui/Makefile.am
@@ -84,4 +84,7 @@ AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_C
 AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(XV_LIBS) $(DX_LIBS) $(GNOME_LIBS) $(SIGC_LIBS)
 
 libgmwidgets_la_LDFLAGS = -export-dynamic
+if HAVE_SHM
+libgmwidgets_la_LDFLAGS += $(SHM_LIBS)
+endif
 libgmwidgets_la_LIBADD = $(AM_LIBS)