Develop and Download Open Source Software

MalonNote

Browse CVS Repository

/[OSDN]/malonnote/aclocal.m4

Diff of /malonnote/aclocal.m4

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

revision 1.2 by maloninc, Fri Aug 5 00:41:32 2005 UTC revision 1.3 by maloninc, Fri Aug 5 01:11:07 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    
355    #serial AM2
356    
357    dnl From Bruno Haible.
358    
359    AC_DEFUN([AM_ICONV],
360    [
361      dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
362      dnl those with the standalone portable GNU libiconv installed).
363    
364      AC_ARG_WITH([libiconv-prefix],
365    [  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
366        for dir in `echo "$withval" | tr : ' '`; do
367          if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
368          if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
369        done
370       ])
371    
372      AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
373        am_cv_func_iconv="no, consider installing GNU libiconv"
374        am_cv_lib_iconv=no
375        AC_TRY_LINK([#include <stdlib.h>
376    #include <iconv.h>],
377          [iconv_t cd = iconv_open("","");
378           iconv(cd,NULL,NULL,NULL,NULL);
379           iconv_close(cd);],
380          am_cv_func_iconv=yes)
381        if test "$am_cv_func_iconv" != yes; then
382          am_save_LIBS="$LIBS"
383          LIBS="$LIBS -liconv"
384          AC_TRY_LINK([#include <stdlib.h>
385    #include <iconv.h>],
386            [iconv_t cd = iconv_open("","");
387             iconv(cd,NULL,NULL,NULL,NULL);
388             iconv_close(cd);],
389            am_cv_lib_iconv=yes
390            am_cv_func_iconv=yes)
391          LIBS="$am_save_LIBS"
392        fi
393      ])
394      if test "$am_cv_func_iconv" = yes; then
395        AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
396        AC_MSG_CHECKING([for iconv declaration])
397        AC_CACHE_VAL(am_cv_proto_iconv, [
398          AC_TRY_COMPILE([
399    #include <stdlib.h>
400    #include <iconv.h>
401    extern
402    #ifdef __cplusplus
403    "C"
404    #endif
405    #if defined(__STDC__) || defined(__cplusplus)
406    size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
407    #else
408    size_t iconv();
409    #endif
410    ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
411          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);"])
412        am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
413        AC_MSG_RESULT([$]{ac_t:-
414             }[$]am_cv_proto_iconv)
415        AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
416          [Define as const if the declaration of iconv() needs const.])
417      fi
418      LIBICONV=
419      if test "$am_cv_lib_iconv" = yes; then
420        LIBICONV="-liconv"
421      fi
422      AC_SUBST(LIBICONV)
423    ])
424    
425  # Do all the work for Automake.                             -*- Autoconf -*-  # Do all the work for Automake.                             -*- Autoconf -*-
426    
427  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Line 860  AC_SUBST([am__tar]) Line 930  AC_SUBST([am__tar])
930  AC_SUBST([am__untar])  AC_SUBST([am__untar])
931  ]) # _AM_PROG_TAR  ]) # _AM_PROG_TAR
932    
 #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)  
 ])  
   
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help