--- main/configure.in	(revision 1347066)
+++ main/configure.in	(working copy)
@@ -613,6 +613,9 @@ 
 AC_ARG_WITH(system-hyphen,
 [  --with-system-hyphen    Use libhypeh already on system
 ],,)
+AC_ARG_WITH(system-coinmp,
+[  --with-system-coinmp      Use CoinMP already on system
+],,)
 AC_ARG_WITH(system-libtextcat,
 [  --with-system-libtextcat      Use libtextcat already on system
 ],,)
@@ -5404,7 +5407,27 @@ 
 AC_SUBST(MYTHES_CFLAGS)
 AC_SUBST(MYTHES_LIBS)
 
+dnl ===================================================================
+dnl Checking for CoinMP
+dnl ===================================================================
+AC_MSG_CHECKING([which coinmp to use])
+if test -n "$with_system_coinmp" -o -n "$with_system_libs" && \
+	test "$with_system_coinmp" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_COINMP=YES
+    AC_CHECK_HEADER(coin/CoinMP.h, [],
+       [ AC_MSG_ERROR(coinmp headers not found.)], [])
+    # some systems need this. Like Ubuntu....
+    AC_CHECK_LIB(m, floor)
+    AC_CHECK_LIB(dl, dlopen)
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_COINMP=NO
+    BUILD_TYPE="$BUILD_TYPE COINMP"
+fi
+AC_SUBST(SYSTEM_COINMP)
 
+
 dnl ===================================================================
 dnl Checking for libtextcat
 dnl ===================================================================
--- main/set_soenv.in	(revision 1347066)
+++ main/set_soenv.in	(working copy)
@@ -2022,6 +2022,7 @@ 
 ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
 ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
 ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
+ToFile( "SYSTEM_COINMP",     "@SYSTEM_COINMP@",    "e" );
 ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",      "e" );
 ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@",   "e" );
 ToFile( "SYSTEM_LIBC",       "@SYSTEM_LIBC@",      "e" );
--- main/scp2/source/calc/makefile.mk	(revision 1347066)
+++ main/scp2/source/calc/makefile.mk	(working copy)
@@ -33,6 +33,10 @@ 
 
 .INCLUDE :	settings.mk
 
+.IF "$(SYSTEM_COINMP)" == "YES"
+SCPDEFS+=-DSYSTEM_COINMP
+.ENDIF
+
 .IF "$(ENABLE_COINMP)" == "YES"
 SCPDEFS+=-DENABLE_COINMP
 .IF "$(GUI)"!="WNT"
--- main/scp2/source/calc/file_calc.scp	(revision 1347066)
+++ main/scp2/source/calc/file_calc.scp	(working copy)
@@ -27,6 +27,13 @@ 
 #ifdef ENABLE_COINMP
 STD_LIB_FILE( gid_File_Lib_Solver, solver)
 
+#ifndef SYSTEM_LPSOLVE
+File gid_File_Lib_Solver
+    Name = SPECIAL_NAME(coinmp);
+    PACKED_LIB_FILE_BODY;
+End
+#endif
+
 #ifdef ADD_ALL_COINMP_LIBRARIES
 File gid_File_Lib_CoinMP
     Name = SPECIAL_NAME_VER(CoinMP,1);