X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4101db8100f956b8ad2ea2d5f9e329134a6cce89..ab0d42f76d5594bd28fdcad35bedeb380902f3ea:/configure diff --git a/configure b/configure index 0197ed78d9..b5ebf1bd03 100755 --- a/configure +++ b/configure @@ -1468,8 +1468,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=yes - DEFAULT_wxUSE_NO_EXCEPTIONS=yes + DEFAULT_wxUSE_NO_RTTI=no + DEFAULT_wxUSE_NO_EXCEPTIONS=no DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -1642,8 +1642,8 @@ else DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=yes - DEFAULT_wxUSE_NO_EXCEPTIONS=yes + DEFAULT_wxUSE_NO_RTTI=no + DEFAULT_wxUSE_NO_EXCEPTIONS=no DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no @@ -13570,7 +13570,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 *-*-darwin* ) CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT" CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT" - LDFLAGS="$LDFLAGS -Wl,-bind_at_load" + LDFLAGS_EXE="$LDFLAGS_EXE -Wl,-bind_at_load" SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o" PIC_FLAG="-dynamic -fPIC" SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}" @@ -17133,9 +17133,9 @@ if test "$TOOLKIT" != "MSW"; then THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ;; *-*-darwin*) - THREAD_OPTS="" + THREAD_OPTS="" ;; - *-*-aix* ) + *-*-aix*) THREAD_OPTS="pthreads" ;; esac @@ -20471,10 +20471,11 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:20478: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:20479: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20518,7 +20519,7 @@ if test "$wxUSE_GUI" = "yes"; then export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ wx_cv_path_ifs wx_cv_program_ext \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype - subdirs="demos samples utils contrib mobile" + subdirs="demos samples utils contrib" fi @@ -20752,6 +20753,7 @@ s%@PORT_FILES@%$PORT_FILES%g s%@DISTDIR@%$DISTDIR%g s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g s%@LDFLAGS_GL@%$LDFLAGS_GL%g +s%@LDFLAGS_EXE@%$LDFLAGS_EXE%g s%@OPENGL_LIBS@%$OPENGL_LIBS%g s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g s%@EXTRADEFS@%$EXTRADEFS%g @@ -21049,7 +21051,7 @@ if test "$no_recursion" != yes; then esac done - for ac_config_dir in demos samples utils contrib mobile; do + for ac_config_dir in demos samples utils contrib; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present.