[asterisk-commits] kpfleming: trunk r95817 - in /trunk: configure configure.ac

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Jan  2 08:20:46 2008
New Revision: 95817

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95817
Log:
actually check for a function present in libiconv (don't know how this test could have worked before) and don't do the check on Linux/GNU systems because libiconv is not present there and attempting to link with '-liconv' always fails (it's not necessary as the iconv functionality is always available)

Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=95817&r1=95816&r2=95817
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jan  2 08:20:46 2008
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 95383 .
+# From configure.ac Revision: 95624 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -12765,11 +12765,13 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -12809,11 +12811,13 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -31744,6 +31748,7 @@
    fi
 fi
 
+if test "${host_os}" != "linux-gnu" ; then
 
 if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then
    pbxlibdir=""
@@ -31755,7 +31760,7 @@
       	 pbxlibdir="-L${ICONV_DIR}"
       fi
    fi
-   pbxfuncname="libiconv"
+   pbxfuncname="iconv_open"
    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
       AST_ICONV_FOUND=yes
    else
@@ -32005,6 +32010,9 @@
    fi
 fi
 
+else
+  PBX_ICONV=1
+fi
 
 
 if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=95817&r1=95816&r2=95817
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jan  2 08:20:46 2008
@@ -618,7 +618,11 @@
    fi
 fi
 
-AST_EXT_LIB_CHECK([ICONV], [iconv], [libiconv], [iconv.h])
+if test "${host_os}" != "linux-gnu" ; then
+  AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
+else
+  PBX_ICONV=1
+fi
 
 AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])