From 635991f6a84c3c6e404bea68fef323ea2b15b517 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Fri, 7 Mar 2025 18:57:27 +0100 Subject: [PATCH] Configure now produces psb_config.h --- base/modules/psb_config.h.in | 29 +++ base/modules/psb_internals.h | 58 ++++-- configure | 381 ++++------------------------------- configure.ac | 91 ++++----- 4 files changed, 155 insertions(+), 404 deletions(-) create mode 100644 base/modules/psb_config.h.in diff --git a/base/modules/psb_config.h.in b/base/modules/psb_config.h.in new file mode 100644 index 00000000..b3c8d11f --- /dev/null +++ b/base/modules/psb_config.h.in @@ -0,0 +1,29 @@ +#ifndef PSB_CONFIG_H +#define PSB_CONFIG_H +#include +#include +#include + +#define @IPK@ +#define @LPK@ + + +typedef int32_t psb_m_t; + +#if defined(IPK4) && defined(LPK4) +typedef int32_t psb_i_t; +typedef int32_t psb_l_t; +#elif defined(IPK4) && defined(LPK8) +typedef int32_t psb_i_t; +typedef int64_t psb_l_t; +#elif defined(IPK8) && defined(LPK8) +typedef int64_t psb_i_t; +typedef int64_t psb_l_t; +#else +#endif +typedef int64_t psb_e_t; + +typedef float psb_s_t; +typedef double psb_d_t; +typedef float complex psb_c_t; +typedef double complex psb_z_t; diff --git a/base/modules/psb_internals.h b/base/modules/psb_internals.h index 5335ffd2..a1c31f24 100644 --- a/base/modules/psb_internals.h +++ b/base/modules/psb_internals.h @@ -1,20 +1,48 @@ #ifndef PSB_INTERNALS_H #define PSB_INTERNALS_H +#include "psb_config.h" + +#define MPI_INTEGER 1 +#define MPI_INTEGER8 2 +#define MPI_REAL 3 +#define MPI_DOUBLE 4 +#define MPI_COMPLEX 5 +#define MPI_DOUBLE_COMPLEX 6 +#define MPI_CHARACTER 7 +#define MPI_LOGICAL 8 +#define MPI_INTEGER2 9 +#define MPI_INTEGER4 10 +#define MPI_COMM_NULL -1 +#define MPI_COMM_WORLD 1 -/* providing a default mangling scheme */ -#ifndef LowerUnderscore -#ifndef LowerDoubleUnderscore -#ifndef LowerCase -#ifndef UpperUnderscore -#ifndef UpperDoubleUnderscore -#ifndef UpperCase -#define LowerUnderscore 1 /* 20110404 the default */ -/* #error "should specify a default mangling scheme" */ -#endif -#endif -#endif -#endif -#endif -#endif +double mpi_wtime(); +void mpi_wait(int *request, int* status, int *ierr); +void mpi_send(void* buf, int* count, int* datatype, + int *dest, int *tag, int *comm, int *ierr); +void mpi_isend(void* buf, int* count, int* datatype, + int *dest, int *tag, int *comm, int *request, + int *ierr); +void mpi_irecv(void* buf, int* count, int* datatype, + int *src, int *tag, int *comm, int *request, + int *ierr); +void mpi_alltoall(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rvt, int* comm, int* ierr); +void mpi_alltoallv(void* sdb, int* sdc, int* sdspl, int* sdt, + void* rvb, int* rvc, int* rdspl, int* rvt, int* comm, int* ierr); +void mpi_gather(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rvt, int *root, int* comm, int* ierr); +void mpi_gatherv(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rdspl, + int* rvt, int* comm, int *root, int* ierr); +void mpi_scatter(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rvt, int *root, int* comm, int* ierr); +void mpi_scatterv(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rdspl, + int* rvt, int* comm, int *root, int* ierr); +void mpi_allgather(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rvt, int* comm, int* ierr); +void mpi_allgatherv(void* sdb, int* sdc, int* sdt, + void* rvb, int* rvc, int* rdspl, + int* rvt, int* comm, int* ierr); #endif diff --git a/configure b/configure index d1538b27..efc5edc3 100755 --- a/configure +++ b/configure @@ -182,8 +182,7 @@ test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes @@ -688,6 +687,8 @@ PRECLIBNAME RSB_LIBS LIBDIR PSBLASRULES +LPK +IPK FINCLUDES CINCLUDES METIS_LIBS @@ -2054,238 +2055,6 @@ fi } # ac_fn_fc_try_link -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that -# executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -# -------------------------------------------- -# Tries to find the compile-time value of EXPR in a program that includes -# INCLUDES, setting VAR accordingly. Returns whether the value could be -# computed -ac_fn_c_compute_int () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_lo=0 ac_mid=0 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_hi=$ac_mid; break -else $as_nop - as_fn_arith $ac_mid + 1 && ac_lo=$as_val - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_hi=-1 ac_mid=-1 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_lo=$ac_mid; break -else $as_nop - as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done -else $as_nop - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_hi=$ac_mid -else $as_nop - as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -done -case $ac_lo in #(( -?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -'') ac_retval=1 ;; -esac - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -static long int longval (void) { return $2; } -static unsigned long int ulongval (void) { return $2; } -#include -#include -int -main (void) -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (($2) < 0) - { - long int i = longval (); - if (i != ($2)) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ($2)) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - echo >>conftest.val; read $3 > confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -printf %s "checking size of void *... " >&6; } -if test ${ac_cv_sizeof_void_p+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" -then : - -else $as_nop - if test "$ac_cv_type_void_p" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -printf "%s\n" "$ac_cv_sizeof_void_p" >&6; } - - - -printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h - - -# Define for platforms with 64 bit (void * ) pointers -if test X"$ac_cv_sizeof_void_p" == X"8" ; then - CDEFINES="-DPtr64Bits $CDEFINES" -fi ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' @@ -7282,40 +6977,6 @@ pac_fc_sec_under=${pac_fc_under#*,} pac_fc_sec_under=${pac_fc_sec_under# } pac_fc_under=${pac_fc_under%%,*} pac_fc_under=${pac_fc_under# } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking defines for C/Fortran name interfaces" >&5 -printf %s "checking defines for C/Fortran name interfaces... " >&6; } -if test "x$pac_fc_case" == "xlower case"; then - if test "x$pac_fc_under" == "xunderscore"; then - if test "x$pac_fc_sec_under" == "xno extra underscore"; then - pac_f_c_names="-DLowerUnderscore" - elif test "x$pac_fc_sec_under" == "xextra underscore"; then - pac_f_c_names="-DLowerDoubleUnderscore" - else - pac_f_c_names="-DUNKNOWN" - fi - elif test "x$pac_fc_under" == "xno underscore"; then - pac_f_c_names="-DLowerCase" - else - pac_f_c_names="-DUNKNOWN" - fi -elif test "x$pac_fc_case" == "xupper case"; then - if test "x$pac_fc_under" == "xunderscore"; then - if test "x$pac_fc_sec_under" == "xno extra underscore"; then - pac_f_c_names="-DUpperUnderscore" - elif test "x$pac_fc_sec_under" == "xextra underscore"; then - pac_f_c_names="-DUpperDoubleUnderscore" - else - pac_f_c_names="-DUNKNOWN" - fi - elif test "x$pac_fc_under" == "xno underscore"; then - pac_f_c_names="-DUpperCase" - else - pac_f_c_names="-DUNKNOWN" - fi -else - pac_f_c_names="-DUNKNOWN" -fi -CDEFINES="$pac_f_c_names $CDEFINES" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pac_f_c_names " >&5 printf "%s\n" " $pac_f_c_names " >&6; } @@ -7751,6 +7412,8 @@ fi if test x"$pac_cv_lpk_size" == x"" ; then pac_cv_lpk_size=8 fi +IPK="IPK$pac_cv_ipk_size" +LPK="LPK$pac_cv_lpk_size" # Enforce sensible combination if (( $pac_cv_lpk_size < $pac_cv_ipk_size )); then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Invalid combination of size specs IPK ${pac_cv_ipk_size} LPK ${pac_cv_lpk_size}. " >&5 @@ -10084,6 +9747,35 @@ fi #AC_CHECK_LIB(umf,umfpack_di_solve,psblas_cv_have_umfpack=yes,psblas_cv_have_umfpack=no,[amd]) +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi # Check whether --with-metis was given. if test ${with_metis+y} @@ -11471,6 +11163,8 @@ FDEFINES=$(PSBFDEFINES) + + @@ -11479,6 +11173,8 @@ FDEFINES=$(PSBFDEFINES) ac_config_files="$ac_config_files Make.inc" +ac_config_files="$ac_config_files base/modules/psb_config.h" + ac_config_files="$ac_config_files util/psb_metis_int.h" cat >confcache <<\_ACEOF @@ -12223,6 +11919,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Make.inc") CONFIG_FILES="$CONFIG_FILES Make.inc" ;; + "base/modules/psb_config.h") CONFIG_FILES="$CONFIG_FILES base/modules/psb_config.h" ;; "util/psb_metis_int.h") CONFIG_FILES="$CONFIG_FILES util/psb_metis_int.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index e7de102d..12072b1a 100755 --- a/configure.ac +++ b/configure.ac @@ -309,14 +309,6 @@ fi ############################################################################### # Linking, symbol mangling, and misc tests ############################################################################### - -# Note : This is functional to Make.inc rules and structure (see below). -AC_LANG([C]) -AC_CHECK_SIZEOF(void *) -# Define for platforms with 64 bit (void * ) pointers -if test X"$ac_cv_sizeof_void_p" == X"8" ; then - CDEFINES="-DPtr64Bits $CDEFINES" -fi AC_LANG([Fortran]) __AC_FC_NAME_MANGLING if test "X$psblas_cv_fc" == X"pg" ; then @@ -330,45 +322,45 @@ dnl AC_MSG_NOTICE([Fortran name mangling: $ac_cv_fc_mangling]) [pac_fc_sec_under=${pac_fc_sec_under# }] [pac_fc_under=${pac_fc_under%%,*}] [pac_fc_under=${pac_fc_under# }] -AC_MSG_CHECKING([defines for C/Fortran name interfaces]) -if test "x$pac_fc_case" == "xlower case"; then - if test "x$pac_fc_under" == "xunderscore"; then - if test "x$pac_fc_sec_under" == "xno extra underscore"; then - pac_f_c_names="-DLowerUnderscore" - elif test "x$pac_fc_sec_under" == "xextra underscore"; then - pac_f_c_names="-DLowerDoubleUnderscore" - else - pac_f_c_names="-DUNKNOWN" -dnl AC_MSG_NOTICE([Fortran name mangling extra underscore unknown case]) - fi - elif test "x$pac_fc_under" == "xno underscore"; then - pac_f_c_names="-DLowerCase" - else - pac_f_c_names="-DUNKNOWN" -dnl AC_MSG_NOTICE([Fortran name mangling underscore unknown case]) - fi -elif test "x$pac_fc_case" == "xupper case"; then - if test "x$pac_fc_under" == "xunderscore"; then - if test "x$pac_fc_sec_under" == "xno extra underscore"; then - pac_f_c_names="-DUpperUnderscore" - elif test "x$pac_fc_sec_under" == "xextra underscore"; then - pac_f_c_names="-DUpperDoubleUnderscore" - else - pac_f_c_names="-DUNKNOWN" -dnl AC_MSG_NOTICE([Fortran name mangling extra underscore unknown case]) - fi - elif test "x$pac_fc_under" == "xno underscore"; then - pac_f_c_names="-DUpperCase" - else - pac_f_c_names="-DUNKNOWN" -dnl AC_MSG_NOTICE([Fortran name mangling underscore unknown case]) - fi -dnl AC_MSG_NOTICE([Fortran name mangling UPPERCASE not handled]) -else - pac_f_c_names="-DUNKNOWN" -dnl AC_MSG_NOTICE([Fortran name mangling unknown case]) -fi -CDEFINES="$pac_f_c_names $CDEFINES" +dnl AC_MSG_CHECKING([defines for C/Fortran name interfaces]) +dnl if test "x$pac_fc_case" == "xlower case"; then +dnl if test "x$pac_fc_under" == "xunderscore"; then +dnl if test "x$pac_fc_sec_under" == "xno extra underscore"; then +dnl pac_f_c_names="-DLowerUnderscore" +dnl elif test "x$pac_fc_sec_under" == "xextra underscore"; then +dnl pac_f_c_names="-DLowerDoubleUnderscore" +dnl else +dnl pac_f_c_names="-DUNKNOWN" +dnl dnl AC_MSG_NOTICE([Fortran name mangling extra underscore unknown case]) +dnl fi +dnl elif test "x$pac_fc_under" == "xno underscore"; then +dnl pac_f_c_names="-DLowerCase" +dnl else +dnl pac_f_c_names="-DUNKNOWN" +dnl dnl AC_MSG_NOTICE([Fortran name mangling underscore unknown case]) +dnl fi +dnl elif test "x$pac_fc_case" == "xupper case"; then +dnl if test "x$pac_fc_under" == "xunderscore"; then +dnl if test "x$pac_fc_sec_under" == "xno extra underscore"; then +dnl pac_f_c_names="-DUpperUnderscore" +dnl elif test "x$pac_fc_sec_under" == "xextra underscore"; then +dnl pac_f_c_names="-DUpperDoubleUnderscore" +dnl else +dnl pac_f_c_names="-DUNKNOWN" +dnl dnl AC_MSG_NOTICE([Fortran name mangling extra underscore unknown case]) +dnl fi +dnl elif test "x$pac_fc_under" == "xno underscore"; then +dnl pac_f_c_names="-DUpperCase" +dnl else +dnl pac_f_c_names="-DUNKNOWN" +dnl dnl AC_MSG_NOTICE([Fortran name mangling underscore unknown case]) +dnl fi +dnl dnl AC_MSG_NOTICE([Fortran name mangling UPPERCASE not handled]) +dnl else +dnl pac_f_c_names="-DUNKNOWN" +dnl dnl AC_MSG_NOTICE([Fortran name mangling unknown case]) +dnl fi +dnl CDEFINES="$pac_f_c_names $CDEFINES" AC_MSG_RESULT([ $pac_f_c_names ]) @@ -571,6 +563,8 @@ fi if test x"$pac_cv_lpk_size" == x"" ; then pac_cv_lpk_size=8 fi +IPK="IPK$pac_cv_ipk_size" +LPK="LPK$pac_cv_lpk_size" # Enforce sensible combination if (( $pac_cv_lpk_size < $pac_cv_ipk_size )); then AC_MSG_NOTICE([[Invalid combination of size specs IPK ${pac_cv_ipk_size} LPK ${pac_cv_lpk_size}. ]]); @@ -1025,6 +1019,8 @@ FDEFINES=$(PSBFDEFINES) $(CXX) $(CXXOPT) $(CXXINCLUDES) $(CXXDEFINES) -c $< -o $@' +AC_SUBST(IPK) +AC_SUBST(LPK) AC_SUBST(PSBLASRULES) AC_SUBST(LIBDIR) AC_SUBST(RSB_LIBS) @@ -1070,6 +1066,7 @@ AC_SUBST(LRSB) # the following files will be created by Automake AC_CONFIG_FILES([Make.inc]) +AC_CONFIG_FILES([base/modules/psb_config.h]) AC_CONFIG_FILES([util/psb_metis_int.h]) AC_OUTPUT() #AC_OUTPUT(Make.inc Makefile)