diff options
| author | Andre Fischer <af@apache.org> | 2012-06-26 13:41:05 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2012-06-26 13:41:05 +0000 |
| commit | 9110bec22f3dafa416e9a51ac763404dd5382d0c (patch) | |
| tree | 876cfb904a17d56141710020f5eb58030842cd45 /sccomp | |
| parent | 9914b3172fd4e3867693e5e63c8085dd66f18b5f (diff) | |
#i118906# Added --with-system-(apr,apr-util,serf,coinmp) switches to configure.
Fixed by: Andre Fischer
Patch by: Pedro Giffuni
Notes
ignore: aoo
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/source/solver/makefile.mk | 12 | ||||
| -rw-r--r-- | sccomp/source/solver/solver.cxx | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk index b8130fc44e58..e0c8870368e9 100644 --- a/sccomp/source/solver/makefile.mk +++ b/sccomp/source/solver/makefile.mk @@ -58,14 +58,22 @@ SHL1STDLIBS= $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ - $(TOOLSLIB) \ - $(COINMPLIBS) + $(TOOLSLIB) SHL1DEPN= makefile.mk SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1VERSIONMAP= $(SOLARENV)/src/component.map DEF1NAME= $(SHL1TARGET) +.IF "$(SYSTEM_COINMP)" == "YES" +CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP +# Use the library flags from configure +SHL1STDLIBS+=$(COINMP_LIBS) +.ELSE +# Use the library flags from solenv +SHL1STDLIBS+=$(COINMPLIBS) +.ENDIF + # --- Resources -------------------------------- RESLIB1LIST=$(SRS)$/solver.srs diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 14d802336406..1eafae250313 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -20,8 +20,11 @@ *************************************************************/ - +#ifdef SYSTEM_COINMP +#include <coin/CoinMP.h> +#else #include <coinmp/CoinMP.h> +#endif #include "solver.hxx" #include "solver.hrc" |