diff -up pidgin-2.10.1/configure.ac.farstream pidgin-2.10.1/configure.ac

--- pidgin-2.10.1/configure.ac.farstream	2011-12-06 03:44:32.000000000 -0500

+++ pidgin-2.10.1/configure.ac	2012-03-09 16:41:34.761780408 -0500

@@ -780,18 +780,18 @@ else

 fi

 dnl #######################################################################

-dnl # Check for Farsight

+dnl # Check for Farstream

 dnl #######################################################################

-AC_ARG_ENABLE(farsight,

-	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],

-	enable_farsight="$enableval", enable_farsight="yes")

-if test "x$enable_farsight" != "xno"; then

-	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [

-		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])

-		AC_SUBST(FARSIGHT_CFLAGS)

-		AC_SUBST(FARSIGHT_LIBS)

+AC_ARG_ENABLE(farstream,

+	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],

+	enable_farstream="$enableval", enable_farstream="yes")

+if test "x$enable_farstream" != "xno"; then

+	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [

+		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])

+		AC_SUBST(FARSTREAM_CFLAGS)

+		AC_SUBST(FARSTREAM_LIBS)

 	], [

-		enable_farsight="no"

+		enable_farstream="no"

 	])

 fi

@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,

 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],

 	enable_vv="$enableval", enable_vv="yes")

 if test "x$enable_vv" != "xno"; then

-	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then

+	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then

 		AC_DEFINE(USE_VV, 1, [Use voice and video])

 	else

 		enable_vv="no"

 		if test "x$force_deps" = "xyes"; then

 			AC_MSG_ERROR([

 Dependencies for voice/video were not met.

-Install the necessary gstreamer and farsight packages first.

+Install the necessary gstreamer and farstream packages first.

 Or use --disable-vv if you do not need voice/video support.

 			])

 		fi

 	fi

 fi

-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")

+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")

 dnl #######################################################################

 dnl # Check for Internationalized Domain Name support

diff -up pidgin-2.10.1/configure.farstream pidgin-2.10.1/configure

--- pidgin-2.10.1/configure.farstream	2011-12-06 03:45:25.000000000 -0500

+++ pidgin-2.10.1/configure	2012-03-09 16:41:51.897611356 -0500

@@ -739,8 +739,8 @@ IDN_LIBS

 IDN_CFLAGS

 USE_VV_FALSE

 USE_VV_TRUE

-FARSIGHT_LIBS

-FARSIGHT_CFLAGS

+FARSTREAM_LIBS

+FARSTREAM_CFLAGS

 GSTINTERFACES_LIBS

 GSTINTERFACES_CFLAGS

 GSTREAMER_LIBS

@@ -828,6 +828,12 @@ INTLTOOL_PROP_RULE

 INTLTOOL_KEYS_RULE

 INTLTOOL_DIRECTORY_RULE

 INTLTOOL_DESKTOP_RULE

+intltool__v_merge_options_0

+intltool__v_merge_options_

+INTLTOOL_V_MERGE_OPTIONS

+INTLTOOL__v_MERGE_0

+INTLTOOL__v_MERGE_

+INTLTOOL_V_MERGE

 INTLTOOL_EXTRACT

 INTLTOOL_MERGE

 INTLTOOL_UPDATE

@@ -862,6 +868,7 @@ LIBTOOL

 am__fastdepCC_FALSE

 am__fastdepCC_TRUE

 CCDEPMODE

+am__nodep

 AMDEPBACKSLASH

 AMDEP_FALSE

 AMDEP_TRUE

@@ -888,6 +895,8 @@ PURPLE_MINOR_VERSION

 PURPLE_MAJOR_VERSION

 AM_BACKSLASH

 AM_DEFAULT_VERBOSITY

+AM_DEFAULT_V

+AM_V

 am__untar

 am__tar

 AMTAR

@@ -989,7 +998,7 @@ with_gconf_schema_file_dir

 enable_schemas_install

 enable_gstreamer

 enable_gstreamer_interfaces

-enable_farsight

+enable_farstream

 enable_vv

 enable_idn

 enable_meanwhile

@@ -1067,8 +1076,8 @@ GSTREAMER_CFLAGS

 GSTREAMER_LIBS

 GSTINTERFACES_CFLAGS

 GSTINTERFACES_LIBS

-FARSIGHT_CFLAGS

-FARSIGHT_LIBS

+FARSTREAM_CFLAGS

+FARSTREAM_LIBS

 IDN_CFLAGS

 IDN_LIBS

 MEANWHILE_CFLAGS

@@ -1743,7 +1752,7 @@ Optional Features:

   --disable-gstreamer     compile without GStreamer audio support

   --disable-gstreamer-interfaces

                           compile without GStreamer interface support

-  --disable-farsight      compile without farsight support

+  --disable-farstream     compile without farstream support

   --disable-vv            compile without voice and video support

   --disable-idn           compile without IDN support

   --disable-meanwhile     compile without meanwhile (required for Sametime

@@ -1776,7 +1785,7 @@ Optional Features:

 Optional Packages:

   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

-  --with-pic              try to use only PIC/non-PIC objects [default=use

+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use

                           both]

   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]

   --with-sysroot=DIR Search for dependent libraries within DIR

@@ -1872,10 +1881,10 @@ Some influential environment variables:

               C compiler flags for GSTINTERFACES, overriding pkg-config

   GSTINTERFACES_LIBS

               linker flags for GSTINTERFACES, overriding pkg-config

-  FARSIGHT_CFLAGS

-              C compiler flags for FARSIGHT, overriding pkg-config

-  FARSIGHT_LIBS

-              linker flags for FARSIGHT, overriding pkg-config

+  FARSTREAM_CFLAGS

+              C compiler flags for FARSTREAM, overriding pkg-config

+  FARSTREAM_LIBS

+              linker flags for FARSTREAM, overriding pkg-config

   IDN_CFLAGS  C compiler flags for IDN, overriding pkg-config

   IDN_LIBS    linker flags for IDN, overriding pkg-config

   MEANWHILE_CFLAGS

@@ -3600,11 +3609,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma

 # We need awk for the "check" target.  The system "awk" is bad on

 # some platforms.

-# Always define AMTAR for backward compatibility.

+# Always define AMTAR for backward compatibility.  Yes, it's still used

+# in the wild :-(  We should find a proper way to deprecate it ...

+AMTAR='$${TAR-tar}'

-AMTAR=${AMTAR-"${am_missing_run}tar"}

-

-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'

+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'

@@ -3620,6 +3629,33 @@ yes) AM_DEFAULT_VERBOSITY=0;;

 no)  AM_DEFAULT_VERBOSITY=1;;

 *)   AM_DEFAULT_VERBOSITY=0;;

 esac

+am_make=${MAKE-make}

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5

+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }

+if ${am_cv_make_support_nested_variables+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  if $as_echo 'TRUE=$(BAR$(V))

+BAR0=false

+BAR1=true

+V=1

+am__doit:

+	@$(TRUE)

+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then

+  am_cv_make_support_nested_variables=yes

+else

+  am_cv_make_support_nested_variables=no

+fi

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5

+$as_echo "$am_cv_make_support_nested_variables" >&6; }

+if test $am_cv_make_support_nested_variables = yes; then

+    AM_V='$(V)'

+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'

+else

+  AM_V=$AM_DEFAULT_VERBOSITY

+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY

+fi

 AM_BACKSLASH='\'

@@ -4535,6 +4571,7 @@ fi

 if test "x$enable_dependency_tracking" != xno; then

   am_depcomp="$ac_aux_dir/depcomp"

   AMDEPBACKSLASH='\'

+  am__nodep='_no'

 fi

  if test "x$enable_dependency_tracking" != xno; then

   AMDEP_TRUE=

@@ -4559,6 +4596,7 @@ else

   # instance it was reported that on HP-UX the gcc test will end up

   # making a dummy file named `D' -- because `-MD' means `put the output

   # in D'.

+  rm -rf conftest.dir

   mkdir conftest.dir

   # Copy depcomp to subdir because otherwise we won't find it if we're

   # using a relative directory.

@@ -4618,7 +4656,7 @@ else

 	break

       fi

       ;;

-    msvisualcpp | msvcmsys)

+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)

       # This compiler won't grok `-c -o', but also, the minuso test has

       # not run yet.  These depmodes are late enough in the game, and

       # so weak that their functioning should not be impacted.

@@ -4838,8 +4876,8 @@ esac

-macro_version='2.4'

-macro_revision='1.3293'

+macro_version='2.4.2'

+macro_revision='1.3337'

@@ -5613,6 +5651,11 @@ else

     lt_cv_sys_max_cmd_len=196608

     ;;

+  os2*)

+    # The test takes a long time on OS/2.

+    lt_cv_sys_max_cmd_len=8192

+    ;;

+

   osf*)

     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure

     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not

@@ -5652,7 +5695,7 @@ else

       # If test is not a shell built-in, we'll probably end up computing a

       # maximum length that is only half of the actual maximum length, but

       # we can't tell.

-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \

+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \

 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&

 	      test $i != 17 # 1/2 MB should be enough

       do

@@ -6081,12 +6124,12 @@ irix5* | irix6* | nonstopux*)

   lt_cv_deplibs_check_method=pass_all

   ;;

-# This must be Linux ELF.

+# This must be glibc/ELF.

 linux* | k*bsd*-gnu | kopensolaris*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

-netbsd* | netbsdelf*-gnu)

+netbsd*)

   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

   else

@@ -6722,13 +6765,13 @@ old_postuninstall_cmds=

 if test -n "$RANLIB"; then

   case $host_os in

   openbsd*)

-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"

+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"

     ;;

   *)

-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"

+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"

     ;;

   esac

-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"

+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"

 fi

 case $host_os in

@@ -6875,6 +6918,7 @@ for ac_symprfx in "" "_"; do

     # which start with @ or ?.

     lt_cv_sys_global_symbol_pipe="$AWK '"\

 "     {last_section=section; section=\$ 3};"\

+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\

 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\

 "     \$ 0!~/External *\|/{next};"\

 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\

@@ -7263,7 +7307,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }

     CFLAGS="$SAVE_CFLAGS"

   fi

   ;;

-sparc*-*solaris*)

+*-*solaris*)

   # Find out which ABI we are using.

   echo 'int i;' > conftest.$ac_ext

   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

@@ -7274,7 +7318,20 @@ sparc*-*solaris*)

     case `/usr/bin/file conftest.o` in

     *64-bit*)

       case $lt_cv_prog_gnu_ld in

-      yes*) LD="${LD-ld} -m elf64_sparc" ;;

+      yes*)

+        case $host in

+        i?86-*-solaris*)

+          LD="${LD-ld} -m elf_x86_64"

+          ;;

+        sparc*-*-solaris*)

+          LD="${LD-ld} -m elf64_sparc"

+          ;;

+        esac

+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.

+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then

+          LD="${LD-ld}_sol2"

+        fi

+        ;;

       *)

 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then

 	  LD="${LD-ld} -64"

@@ -7914,7 +7971,13 @@ else

 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \

 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err

         _lt_result=$?

-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then

+	# If there is a non-empty error log, and "single_module"

+	# appears in it, assume the flag caused a linker warning

+        if test -s conftest.err && $GREP single_module conftest.err; then

+	  cat conftest.err >&5

+	# Otherwise, if the output was created with a 0 exit code from

+	# the compiler, it worked.

+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then

 	  lt_cv_apple_cc_single_mod=yes

 	else

 	  cat conftest.err >&5

@@ -7925,6 +7988,7 @@ else

 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5

 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }

+

     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5

 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

 if ${lt_cv_ld_exported_symbols_list+:} false; then :

@@ -7957,6 +8021,7 @@ rm -f core conftest.err conftest.$ac_obj

 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5

 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

+

     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5

 $as_echo_n "checking for -force_load linker flag... " >&6; }

 if ${lt_cv_ld_force_load+:} false; then :

@@ -7978,7 +8043,9 @@ _LT_EOF

       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5

       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err

       _lt_result=$?

-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then

+      if test -s conftest.err && $GREP force_load conftest.err; then

+	cat conftest.err >&5

+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then

 	lt_cv_ld_force_load=yes

       else

 	cat conftest.err >&5

@@ -8353,7 +8420,22 @@ fi

 # Check whether --with-pic was given.

 if test "${with_pic+set}" = set; then :

-  withval=$with_pic; pic_mode="$withval"

+  withval=$with_pic; lt_p=${PACKAGE-default}

+    case $withval in

+    yes|no) pic_mode=$withval ;;

+    *)

+      pic_mode=default

+      # Look at the argument we got.  We use all the common list separators.

+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"

+      for lt_pkg in $withval; do

+	IFS="$lt_save_ifs"

+	if test "X$lt_pkg" = "X$lt_p"; then

+	  pic_mode=yes

+	fi

+      done

+      IFS="$lt_save_ifs"

+      ;;

+    esac

 else

   pic_mode=default

 fi

@@ -8431,6 +8513,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo

+

+

+

+

 test -z "$LN_S" && LN_S="ln -s"

@@ -8886,7 +8972,9 @@ lt_prog_compiler_static=

     case $cc_basename in

     nvcc*) # Cuda Compiler Driver 2.2

       lt_prog_compiler_wl='-Xlinker '

-      lt_prog_compiler_pic='-Xcompiler -fPIC'

+      if test -n "$lt_prog_compiler_pic"; then

+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"

+      fi

       ;;

     esac

   else

@@ -8977,18 +9065,33 @@ lt_prog_compiler_static=

 	;;

       *)

 	case `$CC -V 2>&1 | sed 5q` in

-	*Sun\ F* | *Sun*Fortran*)

+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)

 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker

 	  lt_prog_compiler_pic='-KPIC'

 	  lt_prog_compiler_static='-Bstatic'

 	  lt_prog_compiler_wl=''

 	  ;;

+	*Sun\ F* | *Sun*Fortran*)

+	  lt_prog_compiler_pic='-KPIC'

+	  lt_prog_compiler_static='-Bstatic'

+	  lt_prog_compiler_wl='-Qoption ld '

+	  ;;

 	*Sun\ C*)

 	  # Sun C 5.9

 	  lt_prog_compiler_pic='-KPIC'

 	  lt_prog_compiler_static='-Bstatic'

 	  lt_prog_compiler_wl='-Wl,'

 	  ;;

+        *Intel*\ [CF]*Compiler*)

+	  lt_prog_compiler_wl='-Wl,'

+	  lt_prog_compiler_pic='-fPIC'

+	  lt_prog_compiler_static='-static'

+	  ;;

+	*Portland\ Group*)

+	  lt_prog_compiler_wl='-Wl,'

+	  lt_prog_compiler_pic='-fpic'

+	  lt_prog_compiler_static='-Bstatic'

+	  ;;

 	esac

 	;;

       esac

@@ -9350,7 +9453,6 @@ $as_echo_n "checking whether the $compil

   hardcode_direct=no

   hardcode_direct_absolute=no

   hardcode_libdir_flag_spec=

-  hardcode_libdir_flag_spec_ld=

   hardcode_libdir_separator=

   hardcode_minus_L=no

   hardcode_shlibpath_var=unsupported

@@ -9394,9 +9496,6 @@ $as_echo_n "checking whether the $compil

   openbsd*)

     with_gnu_ld=no

     ;;

-  linux* | k*bsd*-gnu | gnu*)

-    link_all_deplibs=no

-    ;;

   esac

   ld_shlibs=yes

@@ -9603,8 +9702,7 @@ _LT_EOF

 	xlf* | bgf* | bgxlf* | mpixlf*)

 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself

 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'

-	  hardcode_libdir_flag_spec=

-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'

+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

 	  if test "x$supports_anon_versioning" = xyes; then

 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~

@@ -9619,7 +9717,7 @@ _LT_EOF

       fi

       ;;

-    netbsd* | netbsdelf*-gnu)

+    netbsd*)

       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

 	wlarc=

@@ -9796,7 +9894,6 @@ _LT_EOF

 	if test "$aix_use_runtimelinking" = yes; then

 	  shared_flag="$shared_flag "'${wl}-G'

 	fi

-	link_all_deplibs=no

       else

 	# not using gcc

 	if test "$host_cpu" = ia64; then

@@ -9984,6 +10081,7 @@ fi

 	# The linker will not automatically build a static lib if we build a DLL.

 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'

 	enable_shared_with_static_runtimes=yes

+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'

 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'

 	# Don't use ranlib

 	old_postinstall_cmds='chmod 644 $oldlib'

@@ -10029,6 +10127,7 @@ fi

   hardcode_shlibpath_var=unsupported

   if test "$lt_cv_ld_force_load" = "yes"; then

     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'

+

   else

     whole_archive_flag_spec=''

   fi

@@ -10057,10 +10156,6 @@ fi

       hardcode_shlibpath_var=no

       ;;

-    freebsd1*)

-      ld_shlibs=no

-      ;;

-

     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor

     # support.  Future versions do this automatically, but an explicit c++rt0.o

     # does not break anything, and helps significantly (at the cost of a little

@@ -10073,7 +10168,7 @@ fi

       ;;

     # Unfortunately, older versions of FreeBSD 2 do not have this feature.

-    freebsd2*)

+    freebsd2.*)

       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

       hardcode_direct=yes

       hardcode_minus_L=yes

@@ -10112,7 +10207,6 @@ fi

       fi

       if test "$with_gnu_ld" = no; then

 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'

-	hardcode_libdir_flag_spec_ld='+b $libdir'

 	hardcode_libdir_separator=:

 	hardcode_direct=yes

 	hardcode_direct_absolute=yes

@@ -10253,7 +10347,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >

       link_all_deplibs=yes

       ;;

-    netbsd* | netbsdelf*-gnu)

+    netbsd*)

       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out

       else

@@ -10736,11 +10830,6 @@ esac

-

-

-

-

-

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5

 $as_echo_n "checking dynamic linker characteristics... " >&6; }

@@ -10830,7 +10919,7 @@ need_version=unknown

 case $host_os in

 aix3*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'

   shlibpath_var=LIBPATH

@@ -10839,7 +10928,7 @@ aix3*)

   ;;

 aix[4-9]*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_lib_prefix=no

   need_version=no

   hardcode_into_libs=yes

@@ -10904,7 +10993,7 @@ beos*)

   ;;

 bsdi[45]*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_version=no

   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

   soname_spec='${libname}${release}${shared_ext}$major'

@@ -11043,7 +11132,7 @@ darwin* | rhapsody*)

   ;;

 dgux*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_lib_prefix=no

   need_version=no

   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'

@@ -11051,10 +11140,6 @@ dgux*)

   shlibpath_var=LD_LIBRARY_PATH

   ;;

-freebsd1*)

-  dynamic_linker=no

-  ;;

-

 freebsd* | dragonfly*)

   # DragonFly does not have aout.  When/if they implement a new

   # versioning mechanism, adjust this.

@@ -11062,7 +11147,7 @@ freebsd* | dragonfly*)

     objformat=`/usr/bin/objformat`

   else

     case $host_os in

-    freebsd[123]*) objformat=aout ;;

+    freebsd[23].*) objformat=aout ;;

     *) objformat=elf ;;

     esac

   fi

@@ -11080,7 +11165,7 @@ freebsd* | dragonfly*)

   esac

   shlibpath_var=LD_LIBRARY_PATH

   case $host_os in

-  freebsd2*)

+  freebsd2.*)

     shlibpath_overrides_runpath=yes

     ;;

   freebsd3.[01]* | freebsdelf3.[01]*)

@@ -11100,7 +11185,7 @@ freebsd* | dragonfly*)

   ;;

 gnu*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_lib_prefix=no

   need_version=no

   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

@@ -11111,7 +11196,7 @@ gnu*)

   ;;

 haiku*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_lib_prefix=no

   need_version=no

   dynamic_linker="$host_os runtime_loader"

@@ -11172,7 +11257,7 @@ hpux9* | hpux10* | hpux11*)

   ;;

 interix[3-9]*)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_lib_prefix=no

   need_version=no

   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

@@ -11188,7 +11273,7 @@ irix5* | irix6* | nonstopux*)

     nonstopux*) version_type=nonstopux ;;

     *)

 	if test "$lt_cv_prog_gnu_ld" = yes; then

-		version_type=linux

+		version_type=linux # correct to gnu/linux during the next big refactor

 	else

 		version_type=irix

 	fi ;;

@@ -11225,9 +11310,9 @@ linux*oldld* | linux*aout* | linux*coff*

   dynamic_linker=no

   ;;

-# This must be Linux ELF.

+# This must be glibc/ELF.

 linux* | k*bsd*-gnu | kopensolaris*-gnu)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor

   need_lib_prefix=no

   need_version=no

   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

@@ -11275,10 +11360,14 @@ fi

   # before this can be enabled.

   hardcode_into_libs=yes

+  # Add ABI-specific directories to the system library path.

+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

+

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

@@ -11290,18 +11379,6 @@ fi

   dynamic_linker='GNU/Linux ld.so'

   ;;

-netbsdelf*-gnu)

-  version_type=linux

-  need_lib_prefix=no

-  need_version=no

-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

-  soname_spec='${libname}${release}${shared_ext}$major'

-  shlibpath_var=LD_LIBRARY_PATH

-  shlibpath_overrides_runpath=no

-  hardcode_into_libs=yes

-  dynamic_linker='NetBSD ld.elf_so'

-  ;;

-

 netbsd*)

   version_type=sunos

   need_lib_prefix=no

@@ -11321,7 +11398,7 @@ netbsd*)

   ;;

 newsos6)

-  version_type=linux

+  version_type=linux # correct to gnu/linux during the next big refactor