Changeset 3656

Show
Ignore:
Timestamp:
05/12/08 16:45:42
Author:
robtaylor
Message:
  • m4/ticonv.m4: Add --with-iconv-detect-h option to allow the passing

of a pre-generated iconv-detect.h rather than generating it at
configure time.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3655 r3656  
    22 
    33        * libtinymail/tny-error.c: Fix documentation 
     4 
     52008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk> 
     6 
     7        * m4/ticonv.m4: Add --with-iconv-detect-h option to allow the passing 
     8        of a pre-generated iconv-detect.h rather than generating it at 
     9        configure time. 
    410 
    5112008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk> 

  • trunk/m4/ticonv.m4

    r2814 r3656  
    7777CFLAGS="$CFLAGS -I$srcdir" 
    7878 
    79 AC_MSG_CHECKING(preferred charset formats for system iconv) 
    80 AC_RUN_IFELSE([AC_LANG_SOURCE([[ 
     79AC_ARG_WITH([iconv-detect-h], 
     80        AC_HELP_STRING([--with-iconv-detect-h], 
     81        [Use a hand generated iconv-detect.h rather than running iconv-detect (in libtinymail-camel/camel-lite)]), 
     82        [cp $withval iconv-detect.h], 
     83        AC_MSG_CHECKING(preferred charset formats for system iconv) 
     84        AC_RUN_IFELSE([AC_LANG_SOURCE([[ 
    8185#define CONFIGURE_IN 
    8286#include "iconv-detect.c" 
    83 ]])],[ 
    84         AC_MSG_RESULT(found) 
    85 ],[ 
    86         AC_MSG_RESULT(not found) 
    87 ],[]) 
     87       ]])],[ 
     88               AC_MSG_RESULT(found) 
     89       ],[ 
     90               AC_MSG_RESULT(not found) 
     91       ],[]) 
    8892 
    89 CFLAGS="$save_CFLAGS" 
    90 LIBS="$save_LIBS" 
    91  
     93       CFLAGS="$save_CFLAGS" 
     94       LIBS="$save_LIBS" 
     95        ) 
    9296])