Attachment #76959 for issue #118567

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




AC_ARG_WITH(system-altlinuxhyph,
[  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
],,)
AC_ARG_WITH(system-lpsolve,
[  --with-system-lpsolve         Use lpsolve already on system
],,)
AC_ARG_WITH(system-libtextcat,
[  --with-system-libtextcat      Use libtextcat already on system
],,)

fi

dnl ===================================================================
dnl Checking for lpsolve
dnl ===================================================================
AC_MSG_CHECKING([which lpsolve to use])
if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
	test "$with_system_lpsolve" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_LPSOLVE=YES
    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
    # some systems need this. Like Ubuntu....
    AC_CHECK_LIB(m, floor)
    AC_CHECK_LIB(dl, dlopen)
    AC_CHECK_LIB(lpsolve55, make_lp, ,
        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
else
    AC_MSG_RESULT([internal])
    SYSTEM_LPSOLVE=NO
    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
fi
AC_SUBST(SYSTEM_LPSOLVE)

dnl ===================================================================
dnl Checking for libtextcat
dnl ===================================================================
AC_MSG_CHECKING([which libtextcat to use])

Lines 1-40 Link Here

(-)a/main/lpsolve/lp_solve_5.5-windows.patch (-1 lines)
1	*** misc/lp_solve_5.5/lpsolve55/cgcc.bat Sun Jun 12 04:27:28 2005

Lines 1-116 Link Here

(-)a/main/lpsolve/lp_solve_5.5.patch




#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# 
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org.  If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************

PRJ=.

PRJNAME=lpsolve
TARGET=lpsolve

# --- Settings -----------------------------------------------------

.INCLUDE :	settings.mk

# --- Files --------------------------------------------------------

TARFILE_NAME=lp_solve_5.5
TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8

.IF "$(GUI)"=="WNT"
PATCH_FILES=lp_solve_5.5-windows.patch
.ELSE
PATCH_FILES=lp_solve_5.5.patch
ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
.ENDIF

CONFIGURE_DIR=
CONFIGURE_ACTION=
CONFIGURE_FLAGS=

BUILD_DIR=lpsolve55
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
lpsolve_LDFLAGS=-shared-libgcc
.ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
.ELSE
BUILD_ACTION=cmd /c cvc6.bat
OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
.ENDIF
OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
.ELIF "$(GUI)"=="OS2"
BUILD_ACTION=sh ccc.os2
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib
.ELSE
.IF "$(OS)"=="MACOSX"
.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
BUILD_ACTION=sh ccc.osx
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
.ELSE
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
.ELSE
.IF "$(OS)"=="FREEBSD"
BUILD_ACTION=sh -x ccc.freebsd
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
.ELSE
BUILD_ACTION=sh ccc
.ENDIF
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
.ENDIF
.ENDIF
.ENDIF

OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h

# --- Targets ------------------------------------------------------

.INCLUDE :	set_ext.mk
.INCLUDE :	target.mk
.INCLUDE :	tg_ext.mk


Lines 1-3 Link Here

(-)a/main/lpsolve/prj/build.lst (-3 lines)
1	lps lpsolve : solenv NULL
2	lps lpsolve usr1 - all lps_mkout NULL
3	lps lpsolve nmake - all lps_lpsolve NULL

Lines 1-9 Link Here

(-)a/main/lpsolve/prj/d.lst (-9 lines)
1	mkdir: %_DEST%\inc%_EXT%\lpsolve
2
3	..\%__SRC%\inc\lp_.h %_DEST%\inc%_EXT%\lpsolve\
4	..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so
5	..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
6	..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib
7	..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
8	..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll
9

Lines 145-151 my_components = \ Link Here

(-)a/main/postprocess/packcomponents/makefile.mk (-1 lines)
145	slideshow \	145	slideshow \
146	sm \	146	sm \
147	smd \	147	smd \
148	solver \
149	spl \	148	spl \
150	srtrs1 \	149	srtrs1 \
151	stringresource \	150	stringresource \

Lines 1-4 Link Here

(-)a/main/postprocess/prj/build.lst (-1 / +1 lines)
1	po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL	1	po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
2	po postprocess usr1 - all po_mkout NULL	2	po postprocess usr1 - all po_mkout NULL
3	po postprocess\checkxml nmake - all po_checkxml NULL	3	po postprocess\checkxml nmake - all po_checkxml NULL
4	po postprocess\checkdeliver nmake - all po_checkdlv NULL	4	po postprocess\checkdeliver nmake - all po_checkdlv NULL

Lines 176-182 localedata_es.dll 0x0000000061c10000 0x00020000 Link Here

(-)a/main/postprocess/rebase/coffbase.txt (-1 lines)
176	localedata_euro.dll 0x0000000061b60000 0x000a0000	176	localedata_euro.dll 0x0000000061b60000 0x000a0000
177	localedata_others.dll 0x0000000061aa0000 0x000b0000	177	localedata_others.dll 0x0000000061aa0000 0x000b0000
178	logmi.dll 0x0000000061a70000 0x00020000	178	logmi.dll 0x0000000061a70000 0x00020000
179	lpsolve55.dll 0x0000000061970000 0x00070000
180	mcnttype.dll 0x0000000061950000 0x00010000	179	mcnttype.dll 0x0000000061950000 0x00010000
181	mozabmi.dll 0x00000000597a0000 0x00020000	180	mozabmi.dll 0x00000000597a0000 0x00020000
182	mozabdrvmi.dll 0x00000000597d0000 0x00070000	181	mozabdrvmi.dll 0x00000000597d0000 0x00070000

Lines 339-345 Link Here

(-)a/main/sc/uiconfig/scalc/menubar/menubar.xml (-1 lines)
339	</menu:menupopup>	339	</menu:menupopup>
340	</menu:menu>	340	</menu:menu>
341	<menu:menuitem menu:id=".uno:GoalSeekDialog"/>	341	<menu:menuitem menu:id=".uno:GoalSeekDialog"/>
342	<menu:menuitem menu:id=".uno:SolverDialog"/>
343	<menu:menuitem menu:id=".uno:ScenarioManager"/>	342	<menu:menuitem menu:id=".uno:ScenarioManager"/>
344	<menu:menuseparator/>	343	<menu:menuseparator/>
345	<menu:menuitem menu:id=".uno:ShareDocument"/>	344	<menu:menuitem menu:id=".uno:ShareDocument"/>





#include "macros.inc"

STD_LIB_FILE( gid_File_Lib_Solver, solver)

#ifndef SYSTEM_LPSOLVE
File gid_File_Lib_Lpsolve
    Name = SPECIAL_NAME(lpsolve55);
    PACKED_LIB_FILE_BODY;
End
#endif

STD_LIB_FILE( gid_File_Lib_Analysis, analysis)

File gid_File_Share_Registry_Calc_Xcd


STD_LIB_FILE( gid_File_Lib_Scd, scd)

STD_RES_FILE( gid_File_Res_Solver, solver)

STD_RES_FILE( gid_File_Res_Analysis, analysis)

STD_RES_FILE( gid_File_Res_Date, date)

Lines 1966-1972 ToFile( "REDLAND_LIBS", "@REDLAND_LIBS@", "e" ); Link Here

(-)a/main/set_soenv.in (-1 lines)
1966	ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );	1966	ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
1967	ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );	1967	ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
1968	ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );	1968	ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
1969	ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );
1970	ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );	1969	ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );
1971	ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );	1970	ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );
1972	ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );	1971	ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );

Return to issue 118567

Lines 565-573 AC_ARG_WITH(system-mythes, Link Here

(-)a/main/configure.in (-25 lines)
565	AC_ARG_WITH(system-altlinuxhyph,	565	AC_ARG_WITH(system-altlinuxhyph,
566	[ --with-system-altlinuxhyph Use ALTLinuxhyph already on system	566	[ --with-system-altlinuxhyph Use ALTLinuxhyph already on system
567	],,)	567	],,)
568	AC_ARG_WITH(system-lpsolve,
569	[ --with-system-lpsolve Use lpsolve already on system
570	],,)
571	AC_ARG_WITH(system-libtextcat,	568	AC_ARG_WITH(system-libtextcat,
572	[ --with-system-libtextcat Use libtextcat already on system	569	[ --with-system-libtextcat Use libtextcat already on system
573	],,)	570	],,)
Lines 5267-5294 AC_SUBST(MYTHES_LIBS) Link Here
5267	fi	5264	fi
5268		5265
5269	dnl ===================================================================	5266	dnl ===================================================================
5270	dnl Checking for lpsolve
5271	dnl ===================================================================
5272	AC_MSG_CHECKING([which lpsolve to use])
5273	if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
5274	test "$with_system_lpsolve" != "no"; then
5275	AC_MSG_RESULT([external])
5276	SYSTEM_LPSOLVE=YES
5277	AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
5278	[ AC_MSG_ERROR(lpsolve headers not found.)], [])
5279	# some systems need this. Like Ubuntu....
5280	AC_CHECK_LIB(m, floor)
5281	AC_CHECK_LIB(dl, dlopen)
5282	AC_CHECK_LIB(lpsolve55, make_lp, ,
5283	[ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
5284	else
5285	AC_MSG_RESULT([internal])
5286	SYSTEM_LPSOLVE=NO
5287	BUILD_TYPE="$BUILD_TYPE LPSOLVE"
5288	fi
5289	AC_SUBST(SYSTEM_LPSOLVE)
5290
5291	dnl ===================================================================
5292	dnl Checking for libtextcat	5267	dnl Checking for libtextcat
5293	dnl ===================================================================	5268	dnl ===================================================================
5294	AC_MSG_CHECKING([which libtextcat to use])	5269	AC_MSG_CHECKING([which libtextcat to use])

Lines 1-98 Link Here

(-)a/main/lpsolve/makefile.mk (-98 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2000, 2010 Oracle and/or its affiliates.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# This file is part of OpenOffice.org.
10	#
11	# OpenOffice.org is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU Lesser General Public License version 3
13	# only, as published by the Free Software Foundation.
14	#
15	# OpenOffice.org is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU Lesser General Public License version 3 for more details
19	# (a copy is included in the LICENSE file that accompanied this code).
20	#
21	# You should have received a copy of the GNU Lesser General Public License
22	# version 3 along with OpenOffice.org. If not, see
23	# <http://www.openoffice.org/license.html>
24	# for a copy of the LGPLv3 License.
25	#
26	#*************************************************************************
27
28	PRJ=.
29
30	PRJNAME=lpsolve
31	TARGET=lpsolve
32
33	# --- Settings -----------------------------------------------------
34
35	.INCLUDE : settings.mk
36
37	# --- Files --------------------------------------------------------
38
39	TARFILE_NAME=lp_solve_5.5
40	TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
41
42	.IF "$(GUI)"=="WNT"
43	PATCH_FILES=lp_solve_5.5-windows.patch
44	.ELSE
45	PATCH_FILES=lp_solve_5.5.patch
46	ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
47	.ENDIF
48
49	CONFIGURE_DIR=
50	CONFIGURE_ACTION=
51	CONFIGURE_FLAGS=
52
53	BUILD_DIR=lpsolve55
54	.IF "$(GUI)"=="WNT"
55	.IF "$(COM)"=="GCC"
56	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
57	lpsolve_LDFLAGS=-shared-libgcc
58	.ENDIF
59	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
60	lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
61	.ENDIF
62	BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
63	.ELSE
64	BUILD_ACTION=cmd /c cvc6.bat
65	OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
66	.ENDIF
67	OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
68	.ELIF "$(GUI)"=="OS2"
69	BUILD_ACTION=sh ccc.os2
70	OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib
71	.ELSE
72	.IF "$(OS)"=="MACOSX"
73	.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
74	BUILD_ACTION=sh ccc.osx
75	OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
76	.ELSE
77	.IF "$(COMNAME)"=="sunpro5"
78	BUILD_ACTION=sh ccc.solaris
79	.ELSE
80	.IF "$(OS)"=="FREEBSD"
81	BUILD_ACTION=sh -x ccc.freebsd
82	OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
83	.ELSE
84	BUILD_ACTION=sh ccc
85	.ENDIF
86	OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
87	.ENDIF
88	.ENDIF
89	.ENDIF
90
91	OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
92
93	# --- Targets ------------------------------------------------------
94
95	.INCLUDE : set_ext.mk
96	.INCLUDE : target.mk
97	.INCLUDE : tg_ext.mk
98

Lines 27-41 Link Here

(-)a/main/scp2/source/calc/file_calc.scp (-11 lines)
27		27
28	#include "macros.inc"	28	#include "macros.inc"
29		29
30	STD_LIB_FILE( gid_File_Lib_Solver, solver)
31
32	#ifndef SYSTEM_LPSOLVE
33	File gid_File_Lib_Lpsolve
34	Name = SPECIAL_NAME(lpsolve55);
35	PACKED_LIB_FILE_BODY;
36	End
37	#endif
38
39	STD_LIB_FILE( gid_File_Lib_Analysis, analysis)	30	STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
40		31
41	File gid_File_Share_Registry_Calc_Xcd	32	File gid_File_Share_Registry_Calc_Xcd
Lines 57-64 STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) Link Here
57		48
58	STD_LIB_FILE( gid_File_Lib_Scd, scd)	49	STD_LIB_FILE( gid_File_Lib_Scd, scd)
59		50
60	STD_RES_FILE( gid_File_Res_Solver, solver)
61
62	STD_RES_FILE( gid_File_Res_Analysis, analysis)	51	STD_RES_FILE( gid_File_Res_Analysis, analysis)
63		52
64	STD_RES_FILE( gid_File_Res_Date, date)	53	STD_RES_FILE( gid_File_Res_Date, date)