[ekiga] Fix build with binutils-gold



commit b5d1d73917258ece6a3fabbf0475484ab366a284
Author: C.J. Adams-Collier <cjac colliertech org>
Date:   Sun May 30 23:25:34 2010 +0200

    Fix build with binutils-gold

 configure.ac    |    5 ++++-
 lib/Makefile.am |   12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0619d7d..4386011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,6 +444,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
@@ -932,6 +934,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
@@ -949,7 +952,7 @@ echo "               GStreamer support  :  $GSTREAMER"
 echo "            KAddressBook support  :  $KAB"
 echo "                     KDE support  :  $KDE"
 echo "                    XCAP support  :  $XCAP"
-echo "                Loudmouth support :  $LOUDMOUTH"
+echo "               Loudmouth support  :  $LOUDMOUTH"
 echo ""
 echo "                         OS Type  :  $target_os"
 echo "                    Machine Type  :  $target_cpu"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 254ae8f..2d5ada8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,9 @@ stacklib_dir = $(stacklibdir)
 libekiga_la_SOURCES =
 libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
 
+if !WIN32
+libekiga_la_LDFLAGS += -lX11
+endif
 
 CLEANFILES =
 
@@ -658,6 +661,15 @@ libekiga_la_SOURCES += \
 endif
 
 ##
+# Support for shared memory
+##
+if HAVE_SHM
+
+libekiga_la_LDFLAGS += $(SHM_LIBS)
+
+endif
+
+##
 # Common support for avahi
 ##
 if HAVE_AVAHI



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