diff --git a/configure.in b/configure.in index b641276b26e3b0140dfd55d91413fb86e11d0ce8..af823d6394b0d22aa0f2ef6d79cf859f430c7371 100644 --- a/configure.in +++ b/configure.in @@ -23,11 +23,13 @@ dnl Checks for libraries. dnl Replace `main' with a function in -lm: AC_CHECK_LIB(m, main,,AC_MSG_ERROR(No lm library! Exiting...)) dnl Replace `main' with a function in -lX11: -dnl AC_CHECK_LIB(X11, main,,AC_MSG_ERROR(Exiting...)) +AC_CHECK_LIB(X11, main,,AC_MSG_ERROR(Exiting...)) dnl Replace `main' with a function in -lXext: -dnl AC_CHECK_LIB(Xext, main,,AC_MSG_ERROR(Exiting...)) +AC_CHECK_LIB(Xext, main,,AC_MSG_ERROR(Exiting...)) dnl Replace `main' with a function in -lGL: AC_CHECK_LIB(GL, main) +dnl Replace `main' with a function in -lgl: +AC_CHECK_LIB(gl, main) dnl Checks for header files. AC_HEADER_STDC @@ -64,16 +66,19 @@ dnl destroyed???) dnl ****************************************************************************** plotansi_variable_source=PLOT_for_sun.c +plotansi_variable_object=PLOT_for_sun.lo case "$build_vendor" in *sgi*) AC_MSG_RESULT([Building for SGI system, using -n32 linker flag...]) - object_type=-n32;; + object_type=-n32;; *ibm*) AC_MSG_RESULT([Building for IBM system, affects PLOT_Ansi...]) - plotansi_variable_source=PLOT_for_ibm.c;; + plotansi_variable_source=PLOT_for_ibm.c + plotansi_variable_object=PLOT_for_ibm.lo;; esac case "$build" in *titan*) AC_MSG_RESULT([Building for TITAN cpu/vendor/system?, affects PLOT_Ansi...]) - plotansi_variable_source=PLOT_for_tit.c;; + plotansi_variable_source=PLOT_for_tit.c + plotansi_variable_object=PLOT_for_tit.lo;; esac case "$build_os" in @@ -89,7 +94,6 @@ esac albert_variable_source= gltools_include= - AC_MSG_CHECKING([for libgltools.a]) AC_ARG_WITH(gltools, [ --with-gltools=PATH specify the path of the gltools library], @@ -97,7 +101,9 @@ if test -f $withval/gltools-2-3/libgltools.a; then AC_MSG_RESULT([Found libgltools.a in specified directory $withval/gltools-2-3.]) AC_DEFINE(HAVE_LIBGLTOOLS) gltools_include="-I$withval/gltools-2-3" + gltools_lib="-L$withval/gltools-2-3" albert_variable_source=gltools.c + albert_variable_object=gltools.lo LIBS="-L$withval/gltools-2-3 -lgltools $LIBS" else AC_MSG_RESULT([No libgltools.a found in $withval/gltools-2-3.]) @@ -107,6 +113,7 @@ if test -f ./gltools-2-3/libgltools.a; then AC_DEFINE(HAVE_LIBGLTOOLS) gltools_include="-I`pwd`/gltools-2-3" albert_variable_source=gltools.c + albert_variable_object=gltools.lo LIBS="-L`pwd`/gltools-2-3 -lgltools $LIBS" else AC_MSG_RESULT([No libgltools.a found in ./gltools-2-3]) @@ -115,8 +122,11 @@ fi) AC_SUBST(static_libraries) AC_SUBST(object_type) AC_SUBST(plotansi_variable_source) +AC_SUBST(plotansi_variable_object) AC_SUBST(gltools_include) AC_SUBST(albert_variable_source) +AC_SUBST(albert_variable_object) AC_SUBST(make_own_blas_lib) + AC_OUTPUT(Makefile BLAS/Makefile IAMTOOLS/Makefile SOLVER/Makefile SOLVER/src/Makefile PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile ALBERT/Makefile ALBERT/src/Makefile ALBERT/src/1d/Makefile ALBERT/src/2d/Makefile ALBERT/src/3d/Makefile ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert DEMO/src/1d/Makefile DEMO/src/2d/Makefile DEMO/src/3d/Makefile)