Develop and Download Open Source Software

Browse CVS Repository

Diff of /malonnote/aclocal.m4

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1 by maloninc, Thu Jul 28 03:25:02 2005 UTC revision 1.2 by maloninc, Fri Aug 5 00:41:32 2005 UTC
# Line 860  AC_SUBST([am__tar]) Line 860  AC_SUBST([am__tar])
860  AC_SUBST([am__untar])  AC_SUBST([am__untar])
861  ]) # _AM_PROG_TAR  ]) # _AM_PROG_TAR
862    
863    #serial AM2
864    
865    dnl From Bruno Haible.
866    
867    AC_DEFUN([AM_ICONV],
868    [
869      dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
870      dnl those with the standalone portable GNU libiconv installed).
871    
872      AC_ARG_WITH([libiconv-prefix],
873    [  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
874        for dir in `echo "$withval" | tr : ' '`; do
875          if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
876          if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
877        done
878       ])
879    
880      AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
881        am_cv_func_iconv="no, consider installing GNU libiconv"
882        am_cv_lib_iconv=no
883        AC_TRY_LINK([#include <stdlib.h>
884    #include <iconv.h>],
885          [iconv_t cd = iconv_open("","");
886           iconv(cd,NULL,NULL,NULL,NULL);
887           iconv_close(cd);],
888          am_cv_func_iconv=yes)
889        if test "$am_cv_func_iconv" != yes; then
890          am_save_LIBS="$LIBS"
891          LIBS="$LIBS -liconv"
892          AC_TRY_LINK([#include <stdlib.h>
893    #include <iconv.h>],
894            [iconv_t cd = iconv_open("","");
895             iconv(cd,NULL,NULL,NULL,NULL);
896             iconv_close(cd);],
897            am_cv_lib_iconv=yes
898            am_cv_func_iconv=yes)
899          LIBS="$am_save_LIBS"
900        fi
901      ])
902      if test "$am_cv_func_iconv" = yes; then
903        AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
904        AC_MSG_CHECKING([for iconv declaration])
905        AC_CACHE_VAL(am_cv_proto_iconv, [
906          AC_TRY_COMPILE([
907    #include <stdlib.h>
908    #include <iconv.h>
909    extern
910    #ifdef __cplusplus
911    "C"
912    #endif
913    #if defined(__STDC__) || defined(__cplusplus)
914    size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
915    #else
916    size_t iconv();
917    #endif
918    ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
919          am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
920        am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
921        AC_MSG_RESULT([$]{ac_t:-
922             }[$]am_cv_proto_iconv)
923        AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
924          [Define as const if the declaration of iconv() needs const.])
925      fi
926      LIBICONV=
927      if test "$am_cv_lib_iconv" = yes; then
928        LIBICONV="-liconv"
929      fi
930      AC_SUBST(LIBICONV)
931    ])
932    

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26