--- ooo_dev300_m76/configure.in.orig 2010-03-12 06:27:14.746125000 +0900 +++ ooo_dev300_m76/configure.in 2010-04-13 21:45:28.137625000 +0900 @@ -2211,14 +2211,23 @@ 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/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` + 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 @@ -2229,6 +2238,7 @@ 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 --- ooo_dev300_m76/set_soenv.in.orig 2010-02-25 20:36:42.641875000 +0900 +++ ooo_dev300_m76/set_soenv.in 2010-04-13 22:38:23.062625000 +0900 @@ -1966,6 +1966,7 @@ ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" ); ToFile( "MINGW_GCCLIB_EH", "@MINGW_GCCLIB_EH@", "e" ); ToFile( "MINGW_SHARED_GXXLIB", "@MINGW_SHARED_GXXLIB@", "e" ); + ToFile( "MINGW_SHARED_LIBSTDCPP", "@MINGW_SHARED_LIBSTDCPP@", "e" ); ToFile( "MINGW_GCCDLL", "@MINGW_GCCDLL@", "e" ); ToFile( "MINGW_GXXDLL", "@MINGW_GXXDLL@", "e" ); } --- ooo_dev300_m76/berkeleydb/makefile.mk.orig 2010-02-25 20:52:14.360625000 +0900 +++ ooo_dev300_m76/berkeleydb/makefile.mk 2010-04-13 22:15:01.856375000 +0900 @@ -135,7 +135,7 @@ db_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" CFLAGS+=-D_GLIBCXX_DLL -db_LIBS+=-lstdc++_s +db_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" --- ooo_dev300_m76/cairo/cairo/makefile.mk.orig 2010-02-25 20:54:08.079375000 +0900 +++ ooo_dev300_m76/cairo/cairo/makefile.mk 2010-04-13 22:15:49.153250000 +0900 @@ -78,7 +78,7 @@ cairo_CC+=-shared-libgcc .ENDIF .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -cairo_LIBS+=-lstdc++_s +cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= --- ooo_dev300_m76/curl/makefile.mk.orig 2010-02-25 20:21:53.688750000 +0900 +++ ooo_dev300_m76/curl/makefile.mk 2010-04-13 22:13:50.293875000 +0900 @@ -91,7 +94,7 @@ .ENDIF curl_LIBS=-lws2_32 -lwinmm .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -curl_LIBS+=-lstdc++_s +curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR --- ooo_dev300_m76/icu/makefile.mk.orig 2010-02-25 21:01:20.454375000 +0900 +++ ooo_dev300_m76/icu/makefile.mk 2010-04-13 22:15:32.559500000 +0900 @@ -149,9 +149,9 @@ icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api .ENDIF icu_LDFLAGS+=-L$(COMPATH)$/lib -icu_LIBS=-lmingwthrd +icu_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -icu_LIBS+=-lstdc++_s +icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 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' --- ooo_dev300_m76/libxml2/makefile.mk.orig 2010-02-25 21:02:13.845000000 +0900 +++ ooo_dev300_m76/libxml2/makefile.mk 2010-04-13 22:14:15.340750000 +0900 @@ -65,7 +65,7 @@ .ENDIF xml2_LIBS=-lws2_32 .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xml2_LIBS+=-lstdc++_s +xml2_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure --- ooo_dev300_m76/libxmlsec/makefile.mk.orig 2010-03-12 06:41:14.000000000 +0900 +++ ooo_dev300_m76/libxmlsec/makefile.mk 2010-04-17 18:05:50.306000000 +0900 @@ -95,7 +95,7 @@ .ENDIF xmlsec_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xmlsec_LIBS+=-lstdc++_s +xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure --- ooo_dev300_m76/libxslt/makefile.mk.orig 2010-02-25 21:02:13.985625000 +0900 +++ ooo_dev300_m76/libxslt/makefile.mk 2010-04-13 22:14:29.903250000 +0900 @@ -67,7 +67,7 @@ .ENDIF xslt_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xslt_LIBS+=-lstdc++_s +xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure --- ooo_dev300_m76/lpsolve/makefile.mk.orig 2010-02-25 21:02:17.579375000 +0900 +++ ooo_dev300_m76/lpsolve/makefile.mk 2010-04-13 22:13:08.450125000 +0900 @@ -57,7 +57,7 @@ lpsolve_LDFLAGS=-shared-libgcc .ENDIF .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -lpsolve_LIBS=-lstdc++_s +lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) .ENDIF BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE --- ooo_dev300_m76/nss/makefile.mk.orig 2010-02-25 21:02:21.720000000 +0900 +++ ooo_dev300_m76/nss/makefile.mk 2010-04-13 22:14:46.043875000 +0900 @@ -113,7 +113,7 @@ nss_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -nss_LIBS+=-lstdc++_s +nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF --- ooo_dev300_m76/openssl/opensslmingw.patch.orig 2009-12-10 23:35:19.750000000 +0900 +++ ooo_dev300_m76/openssl/opensslmingw.patch 2010-04-13 22:11:38.622000000 +0900 @@ -69,9 +69,9 @@ +goto finished + +:shared_gxxlib -+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 ++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% +if errorlevel 1 goto end -+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 ++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% +if errorlevel 1 goto end +goto finished --- ooo_dev300_m76/redland/raptor/makefile.mk.orig 2010-02-25 21:05:38.391875000 +0900 +++ ooo_dev300_m76/redland/raptor/makefile.mk 2010-04-13 22:16:08.668875000 +0900 @@ -74,7 +74,7 @@ .ENDIF raptor_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -raptor_LIBS+=-lstdc++_s +raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= --- ooo_dev300_m76/redland/rasqal/makefile.mk.orig 2010-04-08 05:43:24.940625000 +0900 +++ ooo_dev300_m76/redland/rasqal/makefile.mk 2010-04-13 22:16:22.168875000 +0900 @@ -72,7 +72,7 @@ .ENDIF rasqal_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -rasqal_LIBS+=-lstdc++_s +rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= --- ooo_dev300_m76/redland/redland/makefile.mk.orig 2010-04-08 05:43:25.003125000 +0900 +++ ooo_dev300_m76/redland/redland/makefile.mk 2010-04-13 22:16:34.278250000 +0900 @@ -72,7 +72,7 @@ .ENDIF redland_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -redland_LIBS+=-lstdc++_s +redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= --- ooo_dev300_m76/solenv/inc/wntgcci.mk.orig 2010-04-10 07:10:46.186375000 +0900 +++ ooo_dev300_m76/solenv/inc/wntgcci.mk 2010-04-13 22:01:51.809500000 +0900 @@ -128,7 +128,7 @@ LINKFLAGSOPT= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" -STDLIBCPP=-lstdc++_s +STDLIBCPP=$(MINGW_SHARED_LIBSTDCPP) .ELSE STDLIBCPP=-lstdc++ .ENDIF --- ooo_dev300_m76/configure.orig 2010-03-12 06:27:14.652375000 +0900 +++ ooo_dev300_m76/configure 2010-04-17 08:41:02.759125000 +0900 @@ -309,7 +309,7 @@ # include #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_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_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. @@ -9483,16 +9483,25 @@ 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/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` + 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 @@ -31001,6 +31010,7 @@ 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