- Updated configure script to configure lpsolve55 properly (some syst…

…ems require -ldl -lcolamd, others don't). git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5340 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 20, 2010 · 3af9dfd · 3af9dfd
1 parent cf1a053
commit 3af9dfd
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 107 deletions.
diff --git a/Compiler/Makefile.common b/Compiler/Makefile.common
@@ -24,7 +24,6 @@ RTOBJ   = $(srcdir)/runtime/systemimpl.o $(srcdir)/runtime/systemimplmisc.o $(sr
 	$(srcdir)/runtime/printimpl.o $(srcdir)/runtime/ptolemyio.o \
 	$(srcdir)/runtime/errorext.o $(srcdir)/runtime/ErrorMessage.o \
 	$(srcdir)/runtime/daeext.o \
-	$(srcdir)/runtime/lpsolve/lpsolve55.lib  \
 	$(srcdir)/runtime/unitparser.o \
   $(srcdir)/runtime/unitparserext.o \
   $(CORBAOBJ) \

diff --git a/Compiler/omc_debug/Makefile.in b/Compiler/omc_debug/Makefile.in
@@ -11,6 +11,7 @@ ANTLR_HOME = @antlrhome@
 ANTLR_INCP = -I@antlrinc@
 ANTLR_LIBP = -L@antlrlib@
 LIBSOCKET = @LIBSOCKET@
+LIBLPSOLVE55 = @LIBLPSOLVE55@
 
 SHELL	= /bin/sh
 CC	= gcc
@@ -42,7 +43,7 @@ else
  CORBALIBS=
 endif
 
-LDFLAGS = -lm -L$(RMLHOME)/lib/plain -lrml_g $(ANTLR_LIBP) -lantlr $(LIBSOCKET) $(CORBALIBS) -ldl -llpsolve55
+LDFLAGS = -lm -L$(RMLHOME)/lib/plain -lrml_g $(ANTLR_LIBP) -lantlr $(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55)
 
 ifdef QTHOME
 PLTPKGFLAGS = -L../../build/lib -lsendData -L$(QTHOME)/lib -lQtNetwork -lQtCore -lQtGui

diff --git a/Compiler/omc_profiler/Makefile.in b/Compiler/omc_profiler/Makefile.in
@@ -11,6 +11,7 @@ ANTLR_HOME = @antlrhome@
 ANTLR_INCP = -I@antlrinc@
 ANTLR_LIBP = -L@antlrlib@
 LIBSOCKET = @LIBSOCKET@
+LIBLPSOLVE55 = @LIBLPSOLVE55@
 
 SHELL	= /bin/sh
 CC	= gcc
@@ -42,7 +43,7 @@ else
  CORBALIBS=
 endif
 
-LDFLAGS = -lm -L$(RMLHOME)/lib/plain -lrml_p $(ANTLR_LIBP) -lantlr $(LIBSOCKET) $(CORBALIBS) -ldl -llpsolve55
+LDFLAGS = -lm -L$(RMLHOME)/lib/plain -lrml_p $(ANTLR_LIBP) -lantlr $(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55)
 
 ifdef QTHOME
 PLTPKGFLAGS = -L../../build/lib -lsendData -L$(QTHOME)/lib -lQtNetwork -lQtCore -lQtGui

diff --git a/Compiler/omc_release/Makefile.in b/Compiler/omc_release/Makefile.in
@@ -11,6 +11,7 @@ ANTLR_HOME = @antlrhome@
 ANTLR_INCP = -I@antlrinc@
 ANTLR_LIBP = -L@antlrlib@
 LIBSOCKET = @LIBSOCKET@
+LIBLPSOLVE55 = @LIBLPSOLVE55@
 
 USE_CORBA = @USE_CORBA@
 CORBAHOME = @CORBAHOME@
@@ -39,7 +40,7 @@ else
  CORBALIBS=
 endif
 
-LDFLAGS = -lm -L$(RMLHOME)/lib/plain -lrml $(ANTLR_LIBP) -lantlr $(LIBSOCKET) $(CORBALIBS) -ldl -llpsolve55
+LDFLAGS = -lm -L$(RMLHOME)/lib/plain -lrml $(ANTLR_LIBP) -lantlr $(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55)
 
 ifdef QTHOME
 PLTPKGFLAGS = -L../../build/lib -lsendData -L$(QTHOME)/lib -lQtNetwork -lQtCore -lQtGui