[ekiga] Updated the m4/ax_boost_* files

[Julien Puydt <jpuydt src gnome org>]

commit 9a4ecb50a1b3c5b34d52f2b70e3ab2f4d0ebab1d
Author: Snark <jpuydt gnome org>
Date:   Thu Nov 4 18:17:14 2010 +0100

    Updated the m4/ax_boost_* files
    
    That should fix the cross-compilation issues

 m4/ax_boost_base.m4    |    9 +++++++--
 m4/ax_boost_signals.m4 |   14 +++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
index 8f935f6..ec23a0a 100644
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -33,7 +33,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 17
+#serial 18
 
 AC_DEFUN([AX_BOOST_BASE],
 [
@@ -98,8 +98,13 @@ if test "x$want_boost" = "xyes"; then
     dnl this location ist chosen if boost libraries are installed with the --layout=system option
     dnl or if you install boost with RPM
     if test "$ac_boost_path" != ""; then
-        BOOST_LDFLAGS="-L$ac_boost_path/$libsubdir"
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
+        for ac_boost_path_tmp in $libsubdirs; do
+                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
+                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
+                        break
+                fi
+        done
     elif test "$cross_compiling" != yes; then
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
diff --git a/m4/ax_boost_signals.m4 b/m4/ax_boost_signals.m4
index fff2bab..f97b596 100644
--- a/m4/ax_boost_signals.m4
+++ b/m4/ax_boost_signals.m4
@@ -30,7 +30,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 15
+#serial 19
 
 AC_DEFUN([AX_BOOST_SIGNALS],
 [
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_SIGNALS],
             ax_boost_user_signals_lib=""
         else
 		    want_boost="yes"
-        	ax_boost_user_signals_lib="$withval"
+		ax_boost_user_signals_lib="$withval"
 		fi
         ],
         [want_boost="yes"]
@@ -65,11 +65,11 @@ AC_DEFUN([AX_BOOST_SIGNALS],
         AC_CACHE_CHECK(whether the Boost::Signals library is available,
 					   ax_cv_boost_signals,
         [AC_LANG_PUSH([C++])
-		 AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ %:@include <boost/signal.hpp>
+		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ %:@include <boost/signal.hpp>
 											]],
                                   [[boost::signal<void ()> sig;
                                     return 0;
-                                  ]]),
+                                  ]])],
                            ax_cv_boost_signals=yes, ax_cv_boost_signals=no)
          AC_LANG_POP([C++])
 		])
@@ -82,14 +82,14 @@ AC_DEFUN([AX_BOOST_SIGNALS],
 				    AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
                                  [link_signals="no"])
-  				done
+				done
                 if test "x$link_signals" != "xyes"; then
                 for libextension in `ls $BOOSTLIBDIR/boost_signals*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e 's;^\(boost_signals.*\)\.a*$;\1;'` ; do
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
                                  [link_signals="no"])
-  				done
+				done
                 fi
 
             else
@@ -109,6 +109,6 @@ AC_DEFUN([AX_BOOST_SIGNALS],
 		fi
 
 		CPPFLAGS="$CPPFLAGS_SAVED"
-    	LDFLAGS="$LDFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
 	fi
 ])