X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=d522b77ed39c1dab7e16b943902975f3637fa0ef;hb=7dbb606d7b57cdad87a0ffbdb6ea4a274ebca7c0;hp=e95a9709ed31af999d8213cec206915c62cc3949;hpb=689dd035ca641ac6f8dea8337364c65b4b4aacd7;p=ghc-base.git diff --git a/aclocal.m4 b/aclocal.m4 index e95a970..d522b77 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -7,8 +7,10 @@ # Implementation note: We are lazy and use an internal autoconf macro, but it # is supported in autoconf versions 2.50 up to the actual 2.57, so there is # little risk. +# The public AC_COMPUTE_INT macro isn't supported by some versions of +# autoconf. AC_DEFUN([FP_COMPUTE_INT], -[_AC_COMPUTE_INT([$1], [$2], [$3], [$4])[]dnl +[_AC_COMPUTE_INT([$2], [$1], [$3], [$4])[]dnl ])# FP_COMPUTE_INT @@ -19,7 +21,7 @@ AC_DEFUN([FP_COMPUTE_INT], AC_DEFUN([FP_CHECK_CONST], [AS_VAR_PUSHDEF([fp_Cache], [fp_cv_const_$1])[]dnl AC_CACHE_CHECK([value of $1], fp_Cache, -[FP_COMPUTE_INT([$1], fp_check_const_result, [AC_INCLUDES_DEFAULT([$2])], +[FP_COMPUTE_INT(fp_check_const_result, [$1], [AC_INCLUDES_DEFAULT([$2])], [fp_check_const_result=m4_default([$3], ['-1'])]) AS_VAR_SET(fp_Cache, [$fp_check_const_result])])[]dnl AC_DEFINE_UNQUOTED(AS_TR_CPP([CONST_$1]), AS_VAR_GET(fp_Cache), [The value of $1.])[]dnl @@ -49,24 +51,10 @@ done ])# FP_CHECK_CONSTS -dnl ** Map an arithmetic C type to a Haskell type. -dnl Based on autconf's AC_CHECK_SIZEOF. - -dnl FPTOOLS_CHECK_HTYPE(TYPE [, DEFAULT_VALUE, [, VALUE-FOR-CROSS-COMPILATION]) -AC_DEFUN([FPTOOLS_CHECK_HTYPE], -[changequote(<<, >>)dnl -dnl The name to #define. -define(<>, translit(htype_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<>, translit(fptools_cv_htype_$1, [ *], [_p]))dnl -define(<>, translit(fptools_cv_htype_sup_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(Haskell type for $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_CV_NAME_supported=yes -fp_check_htype_save_cppflags="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_RUN_IFELSE([AC_LANG_SOURCE([[#include +dnl FPTOOLS_HTYPE_INCLUDES +AC_DEFUN([FPTOOLS_HTYPE_INCLUDES], +[ +#include #include #if HAVE_SYS_TYPES_H @@ -113,59 +101,85 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include # endif #endif -#if defined(HAVE_GL_GL_H) -# include -#elif defined(HAVE_OPENGL_GL_H) -# include -#endif - -#if defined(HAVE_AL_AL_H) -# include -#elif defined(HAVE_OPENAL_AL_H) -# include -#endif - -#if defined(HAVE_AL_ALC_H) -# include -#elif defined(HAVE_OPENAL_ALC_H) -# include -#endif - #if HAVE_SYS_RESOURCE_H # include #endif #include +]) + + +dnl ** Map an arithmetic C type to a Haskell type. +dnl Based on autconf's AC_CHECK_SIZEOF. -typedef $1 testing; - -int main(void) { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - if (((testing)((int)((testing)1.4))) == ((testing)1.4)) { - fprintf(f, "%s%d\n", - ((testing)(-1) < (testing)0) ? "Int" : "Word", - (int)(sizeof(testing)*8)); - } else { - fprintf(f,"%s\n", - (sizeof(testing) > sizeof(double)) ? "LDouble" : - (sizeof(testing) == sizeof(double)) ? "Double" : "Float"); - } - fclose(f); - exit(0); -}]])],[AC_CV_NAME=`cat conftestval`], -[ifelse([$2], , [AC_CV_NAME=NotReallyAType; AC_CV_NAME_supported=no], [AC_CV_NAME=$2])], -[ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], [AC_CV_NAME=$3])]) -CPPFLAGS="$fp_check_htype_save_cppflags"]) dnl -if test "$AC_CV_NAME_supported" = yes; then - AC_MSG_RESULT($AC_CV_NAME) - AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1]) -else - AC_MSG_RESULT([not supported]) -fi -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -undefine([AC_CV_NAME_supported])dnl +dnl FPTOOLS_CHECK_HTYPE(TYPE [, DEFAULT_VALUE ]) +AC_DEFUN([FPTOOLS_CHECK_HTYPE],[ + changequote(<<, >>) + dnl The name to #define. + define(<>, translit(htype_$1, [a-z *], [A-Z_P])) + dnl The cache variable names. + define(<>, translit(fptools_cv_htype_$1, [ *], [_p])) + define(<>, translit(fptools_cv_htype_sup_$1, [ *], [_p])) + changequote([, ]) + + AC_MSG_CHECKING(Haskell type for $1) + AC_CACHE_VAL(AC_CV_NAME,[ + AC_CV_NAME_supported=yes + FP_COMPUTE_INT([HTYPE_IS_INTEGRAL], + [(($1)((int)(($1)1.4))) == (($1)1.4)], + [FPTOOLS_HTYPE_INCLUDES],[AC_CV_NAME_supported=no]) + if test "$AC_CV_NAME_supported" = "yes" + then + if test "$HTYPE_IS_INTEGRAL" -eq 0 + then + FP_COMPUTE_INT([HTYPE_IS_FLOAT],[sizeof($1) == sizeof(float)], + [FPTOOLS_HTYPE_INCLUDES], + [AC_CV_NAME_supported=no]) + FP_COMPUTE_INT([HTYPE_IS_DOUBLE],[sizeof($1) == sizeof(double)], + [FPTOOLS_HTYPE_INCLUDES], + [AC_CV_NAME_supported=no]) + FP_COMPUTE_INT([HTYPE_IS_LDOUBLE],[sizeof($1) == sizeof(long double)], + [FPTOOLS_HTYPE_INCLUDES], + [AC_CV_NAME_supported=no]) + if test "$HTYPE_IS_FLOAT" -eq 1 + then + AC_CV_NAME=Float + elif test "$HTYPE_IS_DOUBLE" -eq 1 + then + AC_CV_NAME=Double + elif test "$HTYPE_IS_LDOUBLE" -eq 1 + then + AC_CV_NAME=LDouble + else + AC_CV_NAME_supported=no + fi + else + FP_COMPUTE_INT([HTYPE_IS_SIGNED],[(($1)(-1)) < (($1)0)], + [FPTOOLS_HTYPE_INCLUDES], + [AC_CV_NAME_supported=no]) + FP_COMPUTE_INT([HTYPE_SIZE],[sizeof($1) * 8], + [FPTOOLS_HTYPE_INCLUDES], + [AC_CV_NAME_supported=no]) + if test "$HTYPE_IS_SIGNED" -eq 0 + then + AC_CV_NAME="Word$HTYPE_SIZE" + else + AC_CV_NAME="Int$HTYPE_SIZE" + fi + fi + fi + ]) + if test "$AC_CV_NAME_supported" = yes; then + AC_MSG_RESULT($AC_CV_NAME) + 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]) + fi + undefine([AC_TYPE_NAME])dnl + undefine([AC_CV_NAME])dnl + undefine([AC_CV_NAME_supported])dnl ]) @@ -179,7 +193,7 @@ undefine([AC_CV_NAME_supported])dnl # prototype text as its second argument. It also calls AC_LANG_PROGRAM # instead of AC_LANG_CALL AC_DEFUN([FP_SEARCH_LIBS_PROTO], -[AS_VAR_PUSHDEF([ac_Search], [ac_cv_search_$3])dnl +[AS_VAR_PUSHDEF([ac_Search], [ac_cv_search_$1])dnl AC_CACHE_CHECK([for library containing $1], [ac_Search], [ac_func_search_save_LIBS=$LIBS AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) @@ -191,9 +205,9 @@ for ac_lib in '' $4; do LIBS="-l$ac_lib $7 $ac_func_search_save_LIBS" fi AC_LINK_IFELSE([], [AS_VAR_SET([ac_Search], [$ac_res])]) - AS_VAR_SET_IF([ac_Search], [break])dnl + AS_VAR_SET_IF([ac_Search], [break]) done -AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])dnl +AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])]) rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS]) ac_res=AS_VAR_GET([ac_Search])