Skip to content

Commit ae6ba67

Browse files
hzhouhzhou
committed
configure: disable fortran datatypes if fortran is disabled
Make all Fortran types unavailable when Fortran is disabled. Similarly, make all CXX types unavailable when CXX compiler is not detected.
1 parent 5f7721c commit ae6ba67

File tree

1 file changed

+92
-50
lines changed

1 file changed

+92
-50
lines changed

‎configure.ac‎

Lines changed: 92 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,53 +3481,87 @@ AC_DEFINE_UNQUOTED([MPIR_2INT_INTERNAL], [MPIR_2INT$len], [Internal typ
34813481
AC_DEFINE_UNQUOTED([MPIR_SIGNED_CHAR_INTERNAL], [MPIR_INT8], [Internal type for MPI_SIGNED_CHAR])
34823482
len=`expr $ac_cv_sizeof_long_long \* 8`
34833483
AC_DEFINE_UNQUOTED([MPIR_UNSIGNED_LONG_LONG_INTERNAL],[MPIR_INT$len], [Internal type for MPI_UNSIGNED_LONG_LONG])
3484-
len=`expr $pac_cv_f77_sizeof_character \* 8`
3485-
AC_DEFINE_UNQUOTED([MPIR_CHARACTER_INTERNAL], [MPIR_INT$len], [Internal type for MPI_CHARACTER])
3486-
len=`expr $pac_cv_f77_sizeof_integer \* 8`
3487-
AC_DEFINE_UNQUOTED([MPIR_INTEGER_INTERNAL], [MPIR_INT$len], [Internal type for MPI_INTEGER])
3488-
len=`expr $pac_cv_f77_sizeof_real \* 8`
3489-
AC_DEFINE_UNQUOTED([MPIR_REAL_INTERNAL], [MPIR_INT$len], [Internal type for MPI_REAL])
3490-
len=`expr $pac_cv_f77_sizeof_logical \* 8`
3491-
AC_DEFINE_UNQUOTED([MPIR_LOGICAL_INTERNAL], [MPIR_FORTRAN_LOGICAL$len], [Internal type for MPI_LOGICAL])
3492-
len=`expr $pac_cv_f77_sizeof_real \* 8`
3493-
AC_DEFINE_UNQUOTED([MPIR_COMPLEX_INTERNAL], [MPIR_COMPLEX$len], [Internal type for MPI_COMPLEX])
3494-
len=`expr $pac_cv_f77_sizeof_double_precision \* 8`
3495-
AC_DEFINE_UNQUOTED([MPIR_DOUBLE_PRECISION_INTERNAL],[MPIR_FLOAT$len], [Internal type for MPI_DOUBLE_PRECISION])
3496-
len=`expr $pac_cv_f77_sizeof_integer \* 8`
3497-
AC_DEFINE_UNQUOTED([MPIR_2INTEGER_INTERNAL], [MPIR_2INT$len], [Internal type for MPI_2INTEGER])
3498-
len=`expr $pac_cv_f77_sizeof_real \* 8`
3499-
AC_DEFINE_UNQUOTED([MPIR_2REAL_INTERNAL], [MPIR_2FLOAT$len], [Internal type for MPI_2REAL])
3500-
len=`expr $pac_cv_f77_sizeof_double_precision \* 8`
3501-
AC_DEFINE_UNQUOTED([MPIR_DOUBLE_COMPLEX_INTERNAL],[MPIR_COMPLEX$len], [Internal type for MPI_DOUBLE_COMPLEX])
3502-
AC_DEFINE_UNQUOTED([MPIR_2DOUBLE_PRECISION_INTERNAL],[MPIR_2FLOAT$len], [Internal type for MPI_2DOUBLE_PRECISION])
3503-
# skip MPI_2COMPLEX, MPI_2DOUBLE_COMPLEX
3504-
AC_DEFINE_UNQUOTED([MPIR_REAL2_INTERNAL], [MPIR_FLOAT16], [Internal type for MPI_REAL2])
3505-
AC_DEFINE_UNQUOTED([MPIR_REAL4_INTERNAL], [MPIR_FLOAT32], [Internal type for MPI_REAL4])
3506-
AC_DEFINE_UNQUOTED([MPIR_COMPLEX8_INTERNAL], [MPIR_COMPLEX32], [Internal type for MPI_COMPLEX8])
3507-
AC_DEFINE_UNQUOTED([MPIR_REAL8_INTERNAL], [MPIR_FLOAT64], [Internal type for MPI_REAL8])
3508-
AC_DEFINE_UNQUOTED([MPIR_COMPLEX16_INTERNAL], [MPIR_COMPLEX64], [Internal type for MPI_COMPLEX16])
3509-
AC_DEFINE_UNQUOTED([MPIR_REAL16_INTERNAL], [MPIR_FLOAT128], [Internal type for MPI_REAL16])
3510-
AC_DEFINE_UNQUOTED([MPIR_COMPLEX32_INTERNAL], [MPIR_COMPLEX128], [Internal type for MPI_COMPLEX32])
3511-
AC_DEFINE_UNQUOTED([MPIR_INTEGER1_INTERNAL], [MPIR_INT8], [Internal type for MPI_INTEGER1])
3512-
AC_DEFINE_UNQUOTED([MPIR_COMPLEX4_INTERNAL], [MPIR_COMPLEX16], [Internal type for MPI_COMPLEX4])
3513-
AC_DEFINE_UNQUOTED([MPIR_INTEGER2_INTERNAL], [MPIR_INT16], [Internal type for MPI_INTEGER2])
3514-
AC_DEFINE_UNQUOTED([MPIR_INTEGER4_INTERNAL], [MPIR_INT32], [Internal type for MPI_INTEGER4])
3515-
AC_DEFINE_UNQUOTED([MPIR_INTEGER8_INTERNAL], [MPIR_INT64], [Internal type for MPI_INTEGER8])
3516-
AC_DEFINE_UNQUOTED([MPIR_INTEGER16_INTERNAL], [MPIR_INT128], [Internal type for MPI_INTEGER16])
3517-
len=`expr $ac_cv_sizeof_bool \* 8`
3518-
AC_DEFINE_UNQUOTED([MPIR_CXX_BOOL_INTERNAL], [MPIR_INT$len], [Internal type for MPI_CXX_BOOL])
3519-
len=`expr $ac_cv_sizeof_Complex / 2 \* 8`
3520-
AC_DEFINE_UNQUOTED([MPIR_CXX_FLOAT_COMPLEX_INTERNAL],[MPIR_COMPLEX$len], [Internal type for MPI_CXX_FLOAT_COMPLEX])
3521-
len=`expr $ac_cv_sizeof_DoubleComplex / 2 \* 8`
3522-
AC_DEFINE_UNQUOTED([MPIR_CXX_DOUBLE_COMPLEX_INTERNAL],[MPIR_COMPLEX$len], [Internal type for MPI_CXX_DOUBLE_COMPLEX])
3523-
len=`expr $ac_cv_sizeof_LongDoubleComplex / 2 \* 8`
3524-
if test "$len" = 64 ; then
3525-
# long double is an alias of double, e.g. arm64
3526-
internal_type=MPIR_COMPLEX$len
3484+
if test "$enable_f77" = "yes" ; then
3485+
len=`expr $pac_cv_f77_sizeof_character \* 8`
3486+
AC_DEFINE_UNQUOTED([MPIR_CHARACTER_INTERNAL], [MPIR_INT$len], [Internal type for MPI_CHARACTER])
3487+
len=`expr $pac_cv_f77_sizeof_integer \* 8`
3488+
AC_DEFINE_UNQUOTED([MPIR_INTEGER_INTERNAL], [MPIR_INT$len], [Internal type for MPI_INTEGER])
3489+
len=`expr $pac_cv_f77_sizeof_real \* 8`
3490+
AC_DEFINE_UNQUOTED([MPIR_REAL_INTERNAL], [MPIR_INT$len], [Internal type for MPI_REAL])
3491+
len=`expr $pac_cv_f77_sizeof_logical \* 8`
3492+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL_INTERNAL], [MPIR_FORTRAN_LOGICAL$len], [Internal type for MPI_LOGICAL])
3493+
len=`expr $pac_cv_f77_sizeof_real \* 8`
3494+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX_INTERNAL], [MPIR_COMPLEX$len], [Internal type for MPI_COMPLEX])
3495+
len=`expr $pac_cv_f77_sizeof_double_precision \* 8`
3496+
AC_DEFINE_UNQUOTED([MPIR_DOUBLE_PRECISION_INTERNAL],[MPIR_FLOAT$len], [Internal type for MPI_DOUBLE_PRECISION])
3497+
len=`expr $pac_cv_f77_sizeof_integer \* 8`
3498+
AC_DEFINE_UNQUOTED([MPIR_2INTEGER_INTERNAL], [MPIR_2INT$len], [Internal type for MPI_2INTEGER])
3499+
len=`expr $pac_cv_f77_sizeof_real \* 8`
3500+
AC_DEFINE_UNQUOTED([MPIR_2REAL_INTERNAL], [MPIR_2FLOAT$len], [Internal type for MPI_2REAL])
3501+
len=`expr $pac_cv_f77_sizeof_double_precision \* 8`
3502+
AC_DEFINE_UNQUOTED([MPIR_DOUBLE_COMPLEX_INTERNAL],[MPIR_COMPLEX$len], [Internal type for MPI_DOUBLE_COMPLEX])
3503+
AC_DEFINE_UNQUOTED([MPIR_2DOUBLE_PRECISION_INTERNAL],[MPIR_2FLOAT$len], [Internal type for MPI_2DOUBLE_PRECISION])
3504+
# skip MPI_2COMPLEX, MPI_2DOUBLE_COMPLEX
3505+
AC_DEFINE_UNQUOTED([MPIR_REAL2_INTERNAL], [MPIR_FLOAT16], [Internal type for MPI_REAL2])
3506+
AC_DEFINE_UNQUOTED([MPIR_REAL4_INTERNAL], [MPIR_FLOAT32], [Internal type for MPI_REAL4])
3507+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX8_INTERNAL], [MPIR_COMPLEX32], [Internal type for MPI_COMPLEX8])
3508+
AC_DEFINE_UNQUOTED([MPIR_REAL8_INTERNAL], [MPIR_FLOAT64], [Internal type for MPI_REAL8])
3509+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX16_INTERNAL], [MPIR_COMPLEX64], [Internal type for MPI_COMPLEX16])
3510+
AC_DEFINE_UNQUOTED([MPIR_REAL16_INTERNAL], [MPIR_FLOAT128], [Internal type for MPI_REAL16])
3511+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX32_INTERNAL], [MPIR_COMPLEX128], [Internal type for MPI_COMPLEX32])
3512+
AC_DEFINE_UNQUOTED([MPIR_INTEGER1_INTERNAL], [MPIR_INT8], [Internal type for MPI_INTEGER1])
3513+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX4_INTERNAL], [MPIR_COMPLEX16], [Internal type for MPI_COMPLEX4])
3514+
AC_DEFINE_UNQUOTED([MPIR_INTEGER2_INTERNAL], [MPIR_INT16], [Internal type for MPI_INTEGER2])
3515+
AC_DEFINE_UNQUOTED([MPIR_INTEGER4_INTERNAL], [MPIR_INT32], [Internal type for MPI_INTEGER4])
3516+
AC_DEFINE_UNQUOTED([MPIR_INTEGER8_INTERNAL], [MPIR_INT64], [Internal type for MPI_INTEGER8])
3517+
AC_DEFINE_UNQUOTED([MPIR_INTEGER16_INTERNAL], [MPIR_INT128], [Internal type for MPI_INTEGER16])
35273518
else
3528-
internal_type=MPIR_ALT_COMPLEX$len
3519+
AC_DEFINE_UNQUOTED([MPIR_CHARACTER_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_CHARACTER])
3520+
AC_DEFINE_UNQUOTED([MPIR_INTEGER_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_INTEGER])
3521+
AC_DEFINE_UNQUOTED([MPIR_REAL_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_REAL])
3522+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_LOGICAL])
3523+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_COMPLEX])
3524+
AC_DEFINE_UNQUOTED([MPIR_DOUBLE_PRECISION_INTERNAL],[MPI_DATATYPE_NULL], [Internal type for MPI_DOUBLE_PRECISION])
3525+
AC_DEFINE_UNQUOTED([MPIR_2INTEGER_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_2INTEGER])
3526+
AC_DEFINE_UNQUOTED([MPIR_2REAL_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_2REAL])
3527+
AC_DEFINE_UNQUOTED([MPIR_DOUBLE_COMPLEX_INTERNAL],[MPI_DATATYPE_NULL], [Internal type for MPI_DOUBLE_COMPLEX])
3528+
AC_DEFINE_UNQUOTED([MPIR_2DOUBLE_PRECISION_INTERNAL],[MPI_DATATYPE_NULL], [Internal type for MPI_2DOUBLE_PRECISION])
3529+
# skip MPI_2COMPLEX, MPI_2DOUBLE_COMPLEX
3530+
AC_DEFINE_UNQUOTED([MPIR_REAL2_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_REAL2])
3531+
AC_DEFINE_UNQUOTED([MPIR_REAL4_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_REAL4])
3532+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX8_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_COMPLEX8])
3533+
AC_DEFINE_UNQUOTED([MPIR_REAL8_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_REAL8])
3534+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX16_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_COMPLEX16])
3535+
AC_DEFINE_UNQUOTED([MPIR_REAL16_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_REAL16])
3536+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX32_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_COMPLEX32])
3537+
AC_DEFINE_UNQUOTED([MPIR_INTEGER1_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_INTEGER1])
3538+
AC_DEFINE_UNQUOTED([MPIR_COMPLEX4_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_COMPLEX4])
3539+
AC_DEFINE_UNQUOTED([MPIR_INTEGER2_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_INTEGER2])
3540+
AC_DEFINE_UNQUOTED([MPIR_INTEGER4_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_INTEGER4])
3541+
AC_DEFINE_UNQUOTED([MPIR_INTEGER8_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_INTEGER8])
3542+
AC_DEFINE_UNQUOTED([MPIR_INTEGER16_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_INTEGER16])
3543+
fi
3544+
if test -n "$CXX" ; then
3545+
len=`expr $ac_cv_sizeof_bool \* 8`
3546+
AC_DEFINE_UNQUOTED([MPIR_CXX_BOOL_INTERNAL], [MPIR_INT$len], [Internal type for MPI_CXX_BOOL])
3547+
len=`expr $ac_cv_sizeof_Complex / 2 \* 8`
3548+
AC_DEFINE_UNQUOTED([MPIR_CXX_FLOAT_COMPLEX_INTERNAL],[MPIR_COMPLEX$len], [Internal type for MPI_CXX_FLOAT_COMPLEX])
3549+
len=`expr $ac_cv_sizeof_DoubleComplex / 2 \* 8`
3550+
AC_DEFINE_UNQUOTED([MPIR_CXX_DOUBLE_COMPLEX_INTERNAL],[MPIR_COMPLEX$len], [Internal type for MPI_CXX_DOUBLE_COMPLEX])
3551+
len=`expr $ac_cv_sizeof_LongDoubleComplex / 2 \* 8`
3552+
if test "$len" = 64 ; then
3553+
# long double is an alias of double, e.g. arm64
3554+
internal_type=MPIR_COMPLEX$len
3555+
else
3556+
internal_type=MPIR_ALT_COMPLEX$len
3557+
fi
3558+
AC_DEFINE_UNQUOTED([MPIR_CXX_LONG_DOUBLE_COMPLEX_INTERNAL],[$internal_type], [Internal type for MPI_CXX_LONG_DOUBLE_COMPLEX])
3559+
else
3560+
AC_DEFINE_UNQUOTED([MPIR_CXX_BOOL_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_CXX_BOOL])
3561+
AC_DEFINE_UNQUOTED([MPIR_CXX_FLOAT_COMPLEX_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_CXX_FLOAT_COMPLEX])
3562+
AC_DEFINE_UNQUOTED([MPIR_CXX_DOUBLE_COMPLEX_INTERNAL],[MPI_DATATYPE_NULL], [Internal type for MPI_CXX_DOUBLE_COMPLEX])
3563+
AC_DEFINE_UNQUOTED([MPIR_CXX_LONG_DOUBLE_COMPLEX_INTERNAL],[MPI_DATATYPE_NULL], [Internal type for MPI_CXX_LONG_DOUBLE_COMPLEX])
35293564
fi
3530-
AC_DEFINE_UNQUOTED([MPIR_CXX_LONG_DOUBLE_COMPLEX_INTERNAL],[$internal_type], [Internal type for MPI_CXX_LONG_DOUBLE_COMPLEX])
35313565
AC_DEFINE_UNQUOTED([MPIR_INT8_T_INTERNAL], [MPIR_INT8], [Internal type for MPI_INT8_T])
35323566
AC_DEFINE_UNQUOTED([MPIR_INT16_T_INTERNAL], [MPIR_INT16], [Internal type for MPI_INT16_T])
35333567
AC_DEFINE_UNQUOTED([MPIR_INT32_T_INTERNAL], [MPIR_INT32], [Internal type for MPI_INT32_T])
@@ -3557,11 +3591,19 @@ AC_DEFINE_UNQUOTED([MPIR_OFFSET_INTERNAL],[MPIR_INT$len], [Internal type for MPI
35573591
len=`expr $MPI_SIZEOF_COUNT \* 8`
35583592
AC_DEFINE_UNQUOTED([MPIR_COUNT_INTERNAL], [MPIR_INT$len], [Internal type for MPI_COUNT_DATATYPE])
35593593
AC_DEFINE_UNQUOTED([MPIR_C_FLOAT16_INTERNAL], [MPIR_FLOAT16], [Internal type for MPIX_C_FLOAT16])
3560-
AC_DEFINE_UNQUOTED([MPIR_LOGICAL1_INTERNAL], [MPIR_FORTRAN_LOGICAL8], [Internal type for MPI_LOGICAL1])
3561-
AC_DEFINE_UNQUOTED([MPIR_LOGICAL2_INTERNAL], [MPIR_FORTRAN_LOGICAL16], [Internal type for MPI_LOGICAL2])
3562-
AC_DEFINE_UNQUOTED([MPIR_LOGICAL4_INTERNAL], [MPIR_FORTRAN_LOGICAL32], [Internal type for MPI_LOGICAL4])
3563-
AC_DEFINE_UNQUOTED([MPIR_LOGICAL8_INTERNAL], [MPIR_FORTRAN_LOGICAL64], [Internal type for MPI_LOGICAL8])
3564-
AC_DEFINE_UNQUOTED([MPIR_LOGICAL16_INTERNAL], [MPIR_FORTRAN_LOGICAL128],[Internal type for MPI_LOGICAL16])
3594+
if test "$enable_f77" = "yes" ; then
3595+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL1_INTERNAL], [MPIR_FORTRAN_LOGICAL8], [Internal type for MPI_LOGICAL1])
3596+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL2_INTERNAL], [MPIR_FORTRAN_LOGICAL16], [Internal type for MPI_LOGICAL2])
3597+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL4_INTERNAL], [MPIR_FORTRAN_LOGICAL32], [Internal type for MPI_LOGICAL4])
3598+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL8_INTERNAL], [MPIR_FORTRAN_LOGICAL64], [Internal type for MPI_LOGICAL8])
3599+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL16_INTERNAL], [MPIR_FORTRAN_LOGICAL128],[Internal type for MPI_LOGICAL16])
3600+
else
3601+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL1_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_LOGICAL1])
3602+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL2_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_LOGICAL2])
3603+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL4_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_LOGICAL4])
3604+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL8_INTERNAL], [MPI_DATATYPE_NULL], [Internal type for MPI_LOGICAL8])
3605+
AC_DEFINE_UNQUOTED([MPIR_LOGICAL16_INTERNAL], [MPI_DATATYPE_NULL],[Internal type for MPI_LOGICAL16])
3606+
fi
35653607
AC_DEFINE_UNQUOTED([MPIR_BFLOAT16_INTERNAL], [MPIR_BFLOAT16],[Internal type for MPIX_BFLOAT16])
35663608
AC_MSG_RESULT([done])
35673609

0 commit comments

Comments
 (0)