Attachment #75480 for issue #116329

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




      MINGW_GCCLIB_EH=YES
  fi
  AC_MSG_CHECKING([whether to use dynamic libstdc++])
  MINGW_SHARED_LIBSTDCPP=
  if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
    MINGW_SHARED_LIBSTDCPP=stdc++_s
  fi
  if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
    MINGW_SHARED_LIBSTDCPP=stdc++.dll
  fi
  if test -n "$MINGW_SHARED_LIBSTDCPP" ; then
    AC_MSG_CHECKING([dynamic libstdc++ name])
    MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
    if test -n "$MINGW_GXXDLL"; then
        MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
        MINGW_SHARED_GXXLIB=YES
        AC_MSG_RESULT([use $MINGW_GXXDLL])
    else
        MINGW_SHARED_LIBSTDCPP=
        AC_MSG_RESULT([no])
    fi
  else

  AC_SUBST(MINGW_SHARED_GCCLIB)
  AC_SUBST(MINGW_GCCLIB_EH)
  AC_SUBST(MINGW_SHARED_GXXLIB)
  AC_SUBST(MINGW_SHARED_LIBSTDCPP)
  AC_SUBST(MINGW_GCCDLL)
  AC_SUBST(MINGW_GXXDLL)
fi

Lines 1966-1971 Link Here

(-)ooo_dev300_m76/set_soenv.in.orig (+1 lines)
1966	ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" );	1966	ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" );
1967	ToFile( "MINGW_GCCLIB_EH", "@MINGW_GCCLIB_EH@", "e" );	1967	ToFile( "MINGW_GCCLIB_EH", "@MINGW_GCCLIB_EH@", "e" );
1968	ToFile( "MINGW_SHARED_GXXLIB", "@MINGW_SHARED_GXXLIB@", "e" );	1968	ToFile( "MINGW_SHARED_GXXLIB", "@MINGW_SHARED_GXXLIB@", "e" );
		1969	ToFile( "MINGW_SHARED_LIBSTDCPP", "@MINGW_SHARED_LIBSTDCPP@", "e" );
1969	ToFile( "MINGW_GCCDLL", "@MINGW_GCCDLL@", "e" );	1970	ToFile( "MINGW_GCCDLL", "@MINGW_GCCDLL@", "e" );
1970	ToFile( "MINGW_GXXDLL", "@MINGW_GXXDLL@", "e" );	1971	ToFile( "MINGW_GXXDLL", "@MINGW_GXXDLL@", "e" );
1971	}	1972	}

Lines 135-141 Link Here

(-)ooo_dev300_m76/berkeleydb/makefile.mk.orig (-1 / +1 lines)
135	db_LIBS=	135	db_LIBS=
136	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	136	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
137	CFLAGS+=-D_GLIBCXX_DLL	137	CFLAGS+=-D_GLIBCXX_DLL
138	db_LIBS+=-lstdc++_s	138	db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
139	.ENDIF	139	.ENDIF
140	db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)	140	db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
141	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"	141	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"

Lines 78-84 Link Here

(-)ooo_dev300_m76/cairo/cairo/makefile.mk.orig (-1 / +1 lines)
78	cairo_CC+=-shared-libgcc	78	cairo_CC+=-shared-libgcc
79	.ENDIF	79	.ENDIF
80	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	80	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
81	cairo_LIBS+=-lstdc++_s	81	cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
82	.ENDIF	82	.ENDIF
83		83
84	CONFIGURE_DIR=	84	CONFIGURE_DIR=

Lines 91-97 Link Here

(-)ooo_dev300_m76/curl/makefile.mk.orig (-1 / +1 lines)
91	.ENDIF	94	.ENDIF
92	curl_LIBS=-lws2_32 -lwinmm	95	curl_LIBS=-lws2_32 -lwinmm
93	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	96	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
94	curl_LIBS+=-lstdc++_s	97	curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
95	.ENDIF	98	.ENDIF
96	CONFIGURE_DIR=.$/	99	CONFIGURE_DIR=.$/
97	#relative to CONFIGURE_DIR	100	#relative to CONFIGURE_DIR

Lines 149-157 Link Here

(-)ooo_dev300_m76/icu/makefile.mk.orig (-2 / +2 lines)
149	icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api	149	icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
150	.ENDIF	150	.ENDIF
151	icu_LDFLAGS+=-L$(COMPATH)$/lib	151	icu_LDFLAGS+=-L$(COMPATH)$/lib
152	icu_LIBS=-lmingwthrd	152	icu_LIBS=
153	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	153	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
154	icu_LIBS+=-lstdc++_s	154	icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
155	.ENDIF	155	.ENDIF
156	icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2	156	icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2
157	CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'	157	CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'

Lines 65-71 Link Here

(-)ooo_dev300_m76/libxml2/makefile.mk.orig (-1 / +1 lines)
65	.ENDIF	65	.ENDIF
66	xml2_LIBS=-lws2_32	66	xml2_LIBS=-lws2_32
67	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	67	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
68	xml2_LIBS+=-lstdc++_s	68	xml2_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
69	.ENDIF	69	.ENDIF
70	CONFIGURE_DIR=	70	CONFIGURE_DIR=
71	CONFIGURE_ACTION=.$/configure	71	CONFIGURE_ACTION=.$/configure

Lines 95-101 Link Here

(-)ooo_dev300_m76/libxmlsec/makefile.mk.orig (-1 / +1 lines)
95	.ENDIF	95	.ENDIF
96	xmlsec_LIBS=	96	xmlsec_LIBS=
97	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	97	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
98	xmlsec_LIBS+=-lstdc++_s	98	xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
99	.ENDIF	99	.ENDIF
100	CONFIGURE_DIR=	100	CONFIGURE_DIR=
101	CONFIGURE_ACTION=.$/configure	101	CONFIGURE_ACTION=.$/configure

Lines 67-73 Link Here

(-)ooo_dev300_m76/libxslt/makefile.mk.orig (-1 / +1 lines)
67	.ENDIF	67	.ENDIF
68	xslt_LIBS=	68	xslt_LIBS=
69	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	69	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
70	xslt_LIBS+=-lstdc++_s	70	xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
71	.ENDIF	71	.ENDIF
72	CONFIGURE_DIR=	72	CONFIGURE_DIR=
73	CONFIGURE_ACTION=.$/configure	73	CONFIGURE_ACTION=.$/configure

Lines 57-63 Link Here

(-)ooo_dev300_m76/lpsolve/makefile.mk.orig (-1 / +1 lines)
57	lpsolve_LDFLAGS=-shared-libgcc	57	lpsolve_LDFLAGS=-shared-libgcc
58	.ENDIF	58	.ENDIF
59	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	59	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
60	lpsolve_LIBS=-lstdc++_s	60	lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
61	.ENDIF	61	.ENDIF
62	BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat	62	BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
63	.ELSE	63	.ELSE

Lines 113-119 Link Here

(-)ooo_dev300_m76/nss/makefile.mk.orig (-1 / +1 lines)
113		113
114	nss_LIBS=	114	nss_LIBS=
115	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	115	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
116	nss_LIBS+=-lstdc++_s	116	nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
117	.ENDIF	117	.ENDIF
118		118
119		119

Lines 69-77 Link Here

(-)ooo_dev300_m76/openssl/opensslmingw.patch.orig (-2 / +2 lines)
69	+goto finished	69	+goto finished
70	+	70	+
71	+:shared_gxxlib	71	+:shared_gxxlib
72	+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s	72	+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP%
73	+if errorlevel 1 goto end	73	+if errorlevel 1 goto end
74	+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s	74	+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP%
75	+if errorlevel 1 goto end	75	+if errorlevel 1 goto end
76	+goto finished	76	+goto finished
77		77

Lines 74-80 Link Here

(-)ooo_dev300_m76/redland/raptor/makefile.mk.orig (-1 / +1 lines)
74	.ENDIF	74	.ENDIF
75	raptor_LIBS=	75	raptor_LIBS=
76	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	76	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
77	raptor_LIBS+=-lstdc++_s	77	raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
78	.ENDIF	78	.ENDIF
79		79
80	CONFIGURE_DIR=	80	CONFIGURE_DIR=

Lines 72-78 Link Here

(-)ooo_dev300_m76/redland/rasqal/makefile.mk.orig (-1 / +1 lines)
72	.ENDIF	72	.ENDIF
73	rasqal_LIBS=	73	rasqal_LIBS=
74	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	74	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
75	rasqal_LIBS+=-lstdc++_s	75	rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
76	.ENDIF	76	.ENDIF
77		77
78	CONFIGURE_DIR=	78	CONFIGURE_DIR=

Lines 72-78 Link Here

(-)ooo_dev300_m76/redland/redland/makefile.mk.orig (-1 / +1 lines)
72	.ENDIF	72	.ENDIF
73	redland_LIBS=	73	redland_LIBS=
74	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"	74	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
75	redland_LIBS+=-lstdc++_s	75	redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
76	.ENDIF	76	.ENDIF
77		77
78	CONFIGURE_DIR=	78	CONFIGURE_DIR=

Lines 128-134 Link Here

(-)ooo_dev300_m76/solenv/inc/wntgcci.mk.orig (-1 / +1 lines)
128	LINKFLAGSOPT=	128	LINKFLAGSOPT=
129		129
130	.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""	130	.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
131	STDLIBCPP=-lstdc++_s	131	STDLIBCPP=$(MINGW_SHARED_LIBSTDCPP)
132	.ELSE	132	.ELSE
133	STDLIBCPP=-lstdc++	133	STDLIBCPP=-lstdc++
134	.ENDIF	134	.ENDIF




# include <unistd.h>
#endif"

ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_SHARED_LIBSTDCPP MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
ac_subst_files=''

# Initialize some variables set by options.

  fi
  echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5
echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6
  MINGW_SHARED_LIBSTDCPP=
  if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
    MINGW_SHARED_LIBSTDCPP=stdc++_s
  fi
  if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
    MINGW_SHARED_LIBSTDCPP=stdc++.dll
  fi
  if test -n "$MINGW_SHARED_LIBSTDCPP" ; then
    echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6
    MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
    if test -n "$MINGW_GXXDLL"; then
        MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
        MINGW_SHARED_GXXLIB=YES
        echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
echo "${ECHO_T}use $MINGW_GXXDLL" >&6
    else
        MINGW_SHARED_LIBSTDCPP=
        echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
    fi

s,@MINGW_SHARED_GCCLIB@,$MINGW_SHARED_GCCLIB,;t t
s,@MINGW_GCCLIB_EH@,$MINGW_GCCLIB_EH,;t t
s,@MINGW_SHARED_GXXLIB@,$MINGW_SHARED_GXXLIB,;t t
s,@MINGW_SHARED_LIBSTDCPP@,$MINGW_SHARED_LIBSTDCPP,;t t
s,@MINGW_GCCDLL@,$MINGW_GCCDLL,;t t
s,@MINGW_GXXDLL@,$MINGW_GXXDLL,;t t
s,@EXCEPTIONS@,$EXCEPTIONS,;t t

Return to issue 116329

Lines 2211-2224 Link Here

(-)ooo_dev300_m76/configure.in.orig (-1 / +11 lines)
2211	MINGW_GCCLIB_EH=YES	2211	MINGW_GCCLIB_EH=YES
2212	fi	2212	fi
2213	AC_MSG_CHECKING([whether to use dynamic libstdc++])	2213	AC_MSG_CHECKING([whether to use dynamic libstdc++])
		2214	MINGW_SHARED_LIBSTDCPP=
2214	if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then	2215	if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
		2216	MINGW_SHARED_LIBSTDCPP=stdc++_s
		2217	fi
		2218	if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
		2219	MINGW_SHARED_LIBSTDCPP=stdc++.dll
		2220	fi
		2221	if test -n "$MINGW_SHARED_LIBSTDCPP" ; then
2215	AC_MSG_CHECKING([dynamic libstdc++ name])	2222	AC_MSG_CHECKING([dynamic libstdc++ name])
2216	MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a \| sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' \| uniq \| sed -e 's@_@?@g'`	2223	MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a \| sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' \| uniq \| sed -e 's@_@?@g'`
2217	MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`	2224	MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
2218	if test -n "$MINGW_GXXDLL"; then	2225	if test -n "$MINGW_GXXDLL"; then
		2226	MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
2219	MINGW_SHARED_GXXLIB=YES	2227	MINGW_SHARED_GXXLIB=YES
2220	AC_MSG_RESULT([use $MINGW_GXXDLL])	2228	AC_MSG_RESULT([use $MINGW_GXXDLL])
2221	else	2229	else
		2230	MINGW_SHARED_LIBSTDCPP=
2222	AC_MSG_RESULT([no])	2231	AC_MSG_RESULT([no])
2223	fi	2232	fi
2224	else	2233	else
Lines 2229-2234 Link Here
2229	AC_SUBST(MINGW_SHARED_GCCLIB)	2238	AC_SUBST(MINGW_SHARED_GCCLIB)
2230	AC_SUBST(MINGW_GCCLIB_EH)	2239	AC_SUBST(MINGW_GCCLIB_EH)
2231	AC_SUBST(MINGW_SHARED_GXXLIB)	2240	AC_SUBST(MINGW_SHARED_GXXLIB)
		2241	AC_SUBST(MINGW_SHARED_LIBSTDCPP)
2232	AC_SUBST(MINGW_GCCDLL)	2242	AC_SUBST(MINGW_GCCDLL)
2233	AC_SUBST(MINGW_GXXDLL)	2243	AC_SUBST(MINGW_GXXDLL)
2234	fi	2244	fi

Lines 309-315 Link Here

(-)ooo_dev300_m76/configure.orig (-2 / +12 lines)
309	# include <unistd.h>	309	# include <unistd.h>
310	#endif"	310	#endif"
311		311
312	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'	312	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_SHARED_LIBSTDCPP MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
313	ac_subst_files=''	313	ac_subst_files=''
314		314
315	# Initialize some variables set by options.	315	# Initialize some variables set by options.
Lines 9483-9498 Link Here
9483	fi	9483	fi
9484	echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5	9484	echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5
9485	echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6	9485	echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6
		9486	MINGW_SHARED_LIBSTDCPP=
9486	if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then	9487	if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
		9488	MINGW_SHARED_LIBSTDCPP=stdc++_s
		9489	fi
		9490	if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
		9491	MINGW_SHARED_LIBSTDCPP=stdc++.dll
		9492	fi
		9493	if test -n "$MINGW_SHARED_LIBSTDCPP" ; then
9487	echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5	9494	echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
9488	echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6	9495	echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6
9489	MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a \| sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' \| uniq \| sed -e 's@_@?@g'`	9496	MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a \| sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' \| uniq \| sed -e 's@_@?@g'`
9490	MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`	9497	MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
9491	if test -n "$MINGW_GXXDLL"; then	9498	if test -n "$MINGW_GXXDLL"; then
		9499	MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
9492	MINGW_SHARED_GXXLIB=YES	9500	MINGW_SHARED_GXXLIB=YES
9493	echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5	9501	echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
9494	echo "${ECHO_T}use $MINGW_GXXDLL" >&6	9502	echo "${ECHO_T}use $MINGW_GXXDLL" >&6
9495	else	9503	else
		9504	MINGW_SHARED_LIBSTDCPP=
9496	echo "$as_me:$LINENO: result: no" >&5	9505	echo "$as_me:$LINENO: result: no" >&5
9497	echo "${ECHO_T}no" >&6	9506	echo "${ECHO_T}no" >&6
9498	fi	9507	fi
Lines 31001-31006 Link Here
31001	s,@MINGW_SHARED_GCCLIB@,$MINGW_SHARED_GCCLIB,;t t	31010	s,@MINGW_SHARED_GCCLIB@,$MINGW_SHARED_GCCLIB,;t t
31002	s,@MINGW_GCCLIB_EH@,$MINGW_GCCLIB_EH,;t t	31011	s,@MINGW_GCCLIB_EH@,$MINGW_GCCLIB_EH,;t t
31003	s,@MINGW_SHARED_GXXLIB@,$MINGW_SHARED_GXXLIB,;t t	31012	s,@MINGW_SHARED_GXXLIB@,$MINGW_SHARED_GXXLIB,;t t
		31013	s,@MINGW_SHARED_LIBSTDCPP@,$MINGW_SHARED_LIBSTDCPP,;t t
31004	s,@MINGW_GCCDLL@,$MINGW_GCCDLL,;t t	31014	s,@MINGW_GCCDLL@,$MINGW_GCCDLL,;t t
31005	s,@MINGW_GXXDLL@,$MINGW_GXXDLL,;t t	31015	s,@MINGW_GXXDLL@,$MINGW_GXXDLL,;t t
31006	s,@EXCEPTIONS@,$EXCEPTIONS,;t t	31016	s,@EXCEPTIONS@,$EXCEPTIONS,;t t