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.7 by maloninc, Thu Oct 6 05:29:01 2005 UTC revision 1.8 by maloninc, Thu Dec 22 10:48:29 2005 UTC
# Line 352  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] Line 352  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
352  # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.  # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
353  AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])  AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
354    
 #serial AM2  
   
 dnl From Bruno Haible.  
   
 AC_DEFUN([AM_ICONV],  
 [  
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and  
   dnl those with the standalone portable GNU libiconv installed).  
   
   AC_ARG_WITH([libiconv-prefix],  
 [  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [  
     for dir in `echo "$withval" | tr : ' '`; do  
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi  
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi  
     done  
    ])  
   
   AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [  
     am_cv_func_iconv="no, consider installing GNU libiconv"  
     am_cv_lib_iconv=no  
     AC_TRY_LINK([#include <stdlib.h>  
 #include <iconv.h>],  
       [iconv_t cd = iconv_open("","");  
        iconv(cd,NULL,NULL,NULL,NULL);  
        iconv_close(cd);],  
       am_cv_func_iconv=yes)  
     if test "$am_cv_func_iconv" != yes; then  
       am_save_LIBS="$LIBS"  
       LIBS="$LIBS -liconv"  
       AC_TRY_LINK([#include <stdlib.h>  
 #include <iconv.h>],  
         [iconv_t cd = iconv_open("","");  
          iconv(cd,NULL,NULL,NULL,NULL);  
          iconv_close(cd);],  
         am_cv_lib_iconv=yes  
         am_cv_func_iconv=yes)  
       LIBS="$am_save_LIBS"  
     fi  
   ])  
   if test "$am_cv_func_iconv" = yes; then  
     AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])  
     AC_MSG_CHECKING([for iconv declaration])  
     AC_CACHE_VAL(am_cv_proto_iconv, [  
       AC_TRY_COMPILE([  
 #include <stdlib.h>  
 #include <iconv.h>  
 extern  
 #ifdef __cplusplus  
 "C"  
 #endif  
 #if defined(__STDC__) || defined(__cplusplus)  
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);  
 #else  
 size_t iconv();  
 #endif  
 ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")  
       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);"])  
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`  
     AC_MSG_RESULT([$]{ac_t:-  
          }[$]am_cv_proto_iconv)  
     AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,  
       [Define as const if the declaration of iconv() needs const.])  
   fi  
   LIBICONV=  
   if test "$am_cv_lib_iconv" = yes; then  
     LIBICONV="-liconv"  
   fi  
   AC_SUBST(LIBICONV)  
 ])  
   
355  # Do all the work for Automake.                             -*- Autoconf -*-  # Do all the work for Automake.                             -*- Autoconf -*-
356    
357  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8

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