Attachment #78073 for issue #118906

View | Details | Raw Unified | Return to issue 118906
Collapse All | Expand All

Lines 613-618 Link Here

(-)main/configure.in (+23 lines)
613	AC_ARG_WITH(system-hyphen,	613	AC_ARG_WITH(system-hyphen,
614	[ --with-system-hyphen Use libhypeh already on system	614	[ --with-system-hyphen Use libhypeh already on system
615	],,)	615	],,)
		616	AC_ARG_WITH(system-coinmp,
		617	[ --with-system-coinmp Use CoinMP already on system
		618	],,)
616	AC_ARG_WITH(system-libtextcat,	619	AC_ARG_WITH(system-libtextcat,
617	[ --with-system-libtextcat Use libtextcat already on system	620	[ --with-system-libtextcat Use libtextcat already on system
618	],,)	621	],,)
Lines 5404-5410 Link Here
5404	AC_SUBST(MYTHES_CFLAGS)	5407	AC_SUBST(MYTHES_CFLAGS)
5405	AC_SUBST(MYTHES_LIBS)	5408	AC_SUBST(MYTHES_LIBS)
5406		5409
		5410	dnl ===================================================================
		5411	dnl Checking for CoinMP
		5412	dnl ===================================================================
		5413	AC_MSG_CHECKING([which coinmp to use])
		5414	if test -n "$with_system_coinmp" -o -n "$with_system_libs" && \
		5415	test "$with_system_coinmp" != "no"; then
		5416	AC_MSG_RESULT([external])
		5417	SYSTEM_COINMP=YES
		5418	AC_CHECK_HEADER(coin/CoinMP.h, [],
		5419	[ AC_MSG_ERROR(coinmp headers not found.)], [])
		5420	# some systems need this. Like Ubuntu....
		5421	AC_CHECK_LIB(m, floor)
		5422	AC_CHECK_LIB(dl, dlopen)
		5423	else
		5424	AC_MSG_RESULT([internal])
		5425	SYSTEM_COINMP=NO
		5426	BUILD_TYPE="$BUILD_TYPE COINMP"
		5427	fi
		5428	AC_SUBST(SYSTEM_COINMP)
5407		5429
		5430
5408	dnl ===================================================================	5431	dnl ===================================================================
5409	dnl Checking for libtextcat	5432	dnl Checking for libtextcat
5410	dnl ===================================================================	5433	dnl ===================================================================

Lines 2022-2027 Link Here

(-)main/set_soenv.in (+1 lines)
2022	ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );	2022	ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
2023	ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );	2023	ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
2024	ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );	2024	ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
		2025	ToFile( "SYSTEM_COINMP", "@SYSTEM_COINMP@", "e" );
2025	ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );	2026	ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );
2026	ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );	2027	ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );
2027	ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );	2028	ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );

Lines 33-38 Link Here

(-)main/scp2/source/calc/makefile.mk (+4 lines)
33		33
34	.INCLUDE : settings.mk	34	.INCLUDE : settings.mk
35		35
		36	.IF "$(SYSTEM_COINMP)" == "YES"
		37	SCPDEFS+=-DSYSTEM_COINMP
		38	.ENDIF
		39
36	.IF "$(ENABLE_COINMP)" == "YES"	40	.IF "$(ENABLE_COINMP)" == "YES"
37	SCPDEFS+=-DENABLE_COINMP	41	SCPDEFS+=-DENABLE_COINMP
38	.IF "$(GUI)"!="WNT"	42	.IF "$(GUI)"!="WNT"

Lines 27-32 Link Here

(-)main/scp2/source/calc/file_calc.scp (+7 lines)
27	#ifdef ENABLE_COINMP	27	#ifdef ENABLE_COINMP
28	STD_LIB_FILE( gid_File_Lib_Solver, solver)	28	STD_LIB_FILE( gid_File_Lib_Solver, solver)
29		29
		30	#ifndef SYSTEM_LPSOLVE
		31	File gid_File_Lib_Solver
		32	Name = SPECIAL_NAME(coinmp);
		33	PACKED_LIB_FILE_BODY;
		34	End
		35	#endif
		36
30	#ifdef ADD_ALL_COINMP_LIBRARIES	37	#ifdef ADD_ALL_COINMP_LIBRARIES
31	File gid_File_Lib_CoinMP	38	File gid_File_Lib_CoinMP
32	Name = SPECIAL_NAME_VER(CoinMP,1);	39	Name = SPECIAL_NAME_VER(CoinMP,1);

Return to issue 118906