Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ce31f932a1743781333e4c9bfe6420e39b532e25 >--------------------------------------------------------------- commit ce31f932a1743781333e4c9bfe6420e39b532e25 Author: Ian Lynagh <[email protected]> Date: Sun Jun 12 12:54:48 2011 +0100 Refactor the FPTOOLS_CHECK_HTYPE macro We can now specify what happens if the type doesn't exist >--------------------------------------------------------------- aclocal.m4 | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d444fcf..a8f5412 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -112,8 +112,8 @@ AC_DEFUN([FPTOOLS_HTYPE_INCLUDES], dnl ** Map an arithmetic C type to a Haskell type. dnl Based on autconf's AC_CHECK_SIZEOF. -dnl FPTOOLS_CHECK_HTYPE(TYPE) -AC_DEFUN([FPTOOLS_CHECK_HTYPE],[ +dnl FPTOOLS_CHECK_HTYPE_ELSE(TYPE, WHAT_TO_DO_IF_TYPE_DOES_NOT_EXIST) +AC_DEFUN([FPTOOLS_CHECK_HTYPE_ELSE],[ changequote(<<, >>) dnl The name to #define. define(<<AC_TYPE_NAME>>, translit(htype_$1, [a-z *], [A-Z_P])) @@ -174,14 +174,21 @@ AC_DEFUN([FPTOOLS_CHECK_HTYPE],[ AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1]) else - AC_CV_NAME=NotReallyAType - AC_MSG_RESULT([not supported]) + $2 fi undefine([AC_TYPE_NAME])dnl undefine([AC_CV_NAME])dnl undefine([AC_CV_NAME_supported])dnl ]) +dnl FPTOOLS_CHECK_HTYPE(TYPE) +AC_DEFUN([FPTOOLS_CHECK_HTYPE],[ + FPTOOLS_CHECK_HTYPE_ELSE([$1],[ + AC_CV_NAME=NotReallyAType + AC_MSG_RESULT([not supported]) + ]) +]) + # FP_SEARCH_LIBS_PROTO(WHAT, PROTOTYPE, FUNCTION, SEARCH-LIBS, # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
