Merged revisions 163168 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r163168 | tilghman | 2008-12-11 14:02:35 -0600 (Thu, 11 Dec 2008) | 5 lines
  
  Sometimes even Linux needs -lm to link libtonezone, such as when libtonezone
  is compiled statically.
  (closes issue #13887)
   Reported by: tzafrir
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@163170 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 159851 .
+# From configure.ac Revision: 160101 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -46885,7 +46885,75 @@ _ACEOF
 fi
 
 
-if test "${host_os}" != "linux-gnu" ; then
+{ echo "$as_me:$LINENO: checking for tone_zone_find_by_num in -ltonezone" >&5
+echo $ECHO_N "checking for tone_zone_find_by_num in -ltonezone... $ECHO_C" >&6; }
+if test "${ac_cv_lib_tonezone_tone_zone_find_by_num+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltonezone  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tone_zone_find_by_num ();
+int
+main ()
+{
+return tone_zone_find_by_num ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_tonezone_tone_zone_find_by_num=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_tonezone_tone_zone_find_by_num=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tonezone_tone_zone_find_by_num" >&5
+echo "${ECHO_T}$ac_cv_lib_tonezone_tone_zone_find_by_num" >&6; }
+if test $ac_cv_lib_tonezone_tone_zone_find_by_num = yes; then
+  tonezone_does_not_need_lm=yes
+else
+  tonezone_does_not_need_lm=no
+fi
+
+
+if test "${tonezone_does_not_need_lm}" = "no" ; then
   tonezone_extra="-lm"
 fi
 

configure.ac

@@ -1469,7 +1469,9 @@ AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
 
 AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
 
-if test "${host_os}" != "linux-gnu" ; then
+AC_CHECK_LIB([tonezone], [tone_zone_find_by_num], tonezone_does_not_need_lm=yes, tonezone_does_not_need_lm=no)
+
+if test "${tonezone_does_not_need_lm}" = "no" ; then
   tonezone_extra="-lm"
 fi