diff --git a/configure b/configure
index b54857d..b885ed8 100755
--- a/configure
+++ b/configure
@@ -982,7 +982,8 @@
WITH_LTDL_TRUE
WITH_MODULES_FALSE
WITH_MODULES_TRUE
-LTCXXLIBOPTS
+WITH_SHARED_LIBS_FALSE
+WITH_SHARED_LIBS_TRUE
LTDLOPEN
LT_CONFIG_H
CONVENIENCE_LTDL_FALSE
@@ -6841,17 +6842,14 @@
GDI32_LIBS=''
-StaticCplusPlusLibraries='no'
native_win32_build='no'
cygwin_build='no'
case "${host_os}" in
cygwin* )
- StaticCplusPlusLibraries='yes'
cygwin_build='yes'
GDI32_LIBS='-lgdi32'
;;
mingw* )
- StaticCplusPlusLibraries='yes'
native_win32_build='yes'
GDI32_LIBS='-lgdi32'
;;
@@ -8181,13 +8179,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8184: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8182: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8187: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8185: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8190: output\"" >&5)
+ (eval echo "\"\$as_me:8188: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9378,7 +9376,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9381 "configure"' > conftest.$ac_ext
+ echo '#line 9379 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11463,11 +11461,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11466: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11464: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11470: \$? = $ac_status" >&5
+ echo "$as_me:11468: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11802,11 +11800,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11805: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11803: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11809: \$? = $ac_status" >&5
+ echo "$as_me:11807: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11907,11 +11905,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11910: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11908: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11914: \$? = $ac_status" >&5
+ echo "$as_me:11912: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11962,11 +11960,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11965: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11969: \$? = $ac_status" >&5
+ echo "$as_me:11967: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14332,7 +14330,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14335 "configure"
+#line 14333 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14428,7 +14426,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14431 "configure"
+#line 14429 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16384,11 +16382,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16387: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16385: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16391: \$? = $ac_status" >&5
+ echo "$as_me:16389: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16483,11 +16481,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16490: \$? = $ac_status" >&5
+ echo "$as_me:16488: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16535,11 +16533,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16538: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16542: \$? = $ac_status" >&5
+ echo "$as_me:16540: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17947,7 +17945,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 17950 "configure"
+#line 17948 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18563,10 +18561,12 @@
libtool_build_static_libs='yes'
fi
-# MinGW and Cygwin can't build C++ DLLs which support exceptions.
-if test "${StaticCplusPlusLibraries}" = 'yes'; then
- LTCXXLIBOPTS='--static'
-
+ if test "${libtool_build_shared_libs}" = 'yes'; then
+ WITH_SHARED_LIBS_TRUE=
+ WITH_SHARED_LIBS_FALSE='#'
+else
+ WITH_SHARED_LIBS_TRUE='#'
+ WITH_SHARED_LIBS_FALSE=
fi
#
@@ -31070,6 +31070,10 @@
ltdl_LTLIBOBJS=$_ltdl_ltlibobjs
+if test -z "${WITH_SHARED_LIBS_TRUE}" && test -z "${WITH_SHARED_LIBS_FALSE}"; then
+ as_fn_error "conditional \"WITH_SHARED_LIBS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${WITH_MODULES_TRUE}" && test -z "${WITH_MODULES_FALSE}"; then
as_fn_error "conditional \"WITH_MODULES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5