Skip to content

Commit

Permalink
- Added LD_LAPACK to configure.in
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11180 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Feb 23, 2012
1 parent 6ca9d13 commit f3d5af8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Compiler/omc_debug/Makefile.in
Expand Up @@ -32,7 +32,7 @@ endif

LDFLAGS = @LDFLAGS@ -lm -L$(RMLHOME)/lib/plain -lrml_g -lpthread \
$(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55) \
-L../../build/lib/omc @RT_LDFLAGS@ -llapack -lblas @SQLITE3_LIBS@
-L../../build/lib/omc @RT_LDFLAGS@ @LD_LAPACK@ @SQLITE3_LIBS@

PROG = omcd
RMLC = @rmlc_bin@ -g -Wc,-O1 #-Wr,-East,-Ecps,-Efol
Expand Down
2 changes: 1 addition & 1 deletion Compiler/omc_profiler/Makefile.in
Expand Up @@ -29,7 +29,7 @@ endif

LDFLAGS = @LDFLAGS@ -lm -L$(RMLHOME)/lib/plain -lrml_p \
$(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55) \
-L../../build/lib/omc @RT_LDFLAGS@ -llapack -lblas @SQLITE3_LIBS@
-L../../build/lib/omc @RT_LDFLAGS@ @LD_LAPACK@ @SQLITE3_LIBS@

PROG = omcp
RMLC = @rmlc_bin@ -p
Expand Down
2 changes: 1 addition & 1 deletion Compiler/omc_release/Makefile.in
Expand Up @@ -29,7 +29,7 @@ endif

LDFLAGS = @LDFLAGS@ -lm -L$(RMLHOME)/lib/plain -lrml \
$(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55) \
-L../../build/lib/omc @RT_LDFLAGS@ -llapack -lblas @SQLITE3_LIBS@
-L../../build/lib/omc @RT_LDFLAGS@ @LD_LAPACK@ @SQLITE3_LIBS@

PROG = omc
RMLC = @rmlc_bin@
Expand Down
10 changes: 10 additions & 0 deletions configure.in
Expand Up @@ -38,6 +38,7 @@ AC_SUBST(SQLITE3_LIBS)
AC_SUBST(OPENMP_CFLAGS)
AC_SUBST(MAKE)
AC_SUBST(LIBREADLINE)
AC_SUBST(LD_LAPACK)

if test -z "$MAKE"; then
MAKE=make
Expand Down Expand Up @@ -285,6 +286,15 @@ else
SQLITE3_LIBS=$WANT_STATIC_SQLITE
fi

# Cannot use AX_LAPACK since it assumes a Fortran compiler is used
AC_ARG_WITH(lapack, [ --with-lapack=[-llapack -lblas]],[LD_LAPACK="$withval"],[LD_LAPACK="-llapack -lblas"])
if test "$LD_LAPACK" = "yes"; then
LD_LAPACK="-llapack -lblas"
fi
LIBS="$LD_LAPACK"
AC_MSG_CHECKING([LAPACK flags])
AC_LINK_IFELSE([AC_LANG_CALL([], [dgesv_])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([failed using $LD_LAPACK])])

dnl should we use corba?

AC_ARG_WITH(CORBA, [ --with-CORBA=DIR use mico corba installed in DIR (or use mico-config)],[WANT_MICO="$withval"],[WANT_MICO="no"])
Expand Down

0 comments on commit f3d5af8

Please sign in to comment.