diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:20:46 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:20:46 +0000 |
| commit | 7eb5322b5bdb438ec5ca5751e4394adcd20cc824 (patch) | |
| tree | ff3bbe9b1a68e4aaa64837ea242cb9eb320a2ed0 /configure | |
| parent | 933ddf410aee42eac51dfd9f3d5e5c4a98efaf22 (diff) | |
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)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95817 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -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 @@ _ACEOF 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 confdefs.h >>conftest.$ac_ext 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 @@ _ACEOF 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 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then 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 @@ _ACEOF fi fi +else + PBX_ICONV=1 +fi if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then |