removed some obsolete parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
parent
55826fcf4f
commit
dc838d98f1
192
configure
vendored
192
configure
vendored
@ -311,7 +311,7 @@ ac_includes_default="\
|
||||
# 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -24733,19 +24733,6 @@ SHARED=0
|
||||
if test "$wxUSE_SHARED" = "yes"; then
|
||||
SHARED=1
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
|
||||
else
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
|
||||
fi
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
PIC_FLAG="-fPIC"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
found_versioning=no
|
||||
|
||||
@ -24787,85 +24774,8 @@ echo "${ECHO_T}$wx_cv_version_script" >&6
|
||||
fi
|
||||
|
||||
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
|
||||
case "${host}" in
|
||||
*-hp-hpux* )
|
||||
if test "$GCC" = "yes"; then
|
||||
SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
|
||||
else
|
||||
LDFLAGS="$LDFLAGS -L/usr/lib"
|
||||
|
||||
SHARED_LD="${CXX} -b -o"
|
||||
PIC_FLAG="+Z"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WX_ALL_INSTALLED="preinstall_gl"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
|
||||
else
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-linux* | *-*-gnu* )
|
||||
if test "$GCC" != "yes"; then
|
||||
echo "$as_me:$LINENO: checking for Intel compiler" >&5
|
||||
echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6
|
||||
if test "${wx_cv_prog_icc+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#ifndef __INTEL_COMPILER
|
||||
#error Not icc
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
wx_cv_prog_icc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
wx_cv_prog_icc=no
|
||||
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $wx_cv_prog_icc" >&5
|
||||
echo "${ECHO_T}$wx_cv_prog_icc" >&6
|
||||
if test "$wx_cv_prog_icc" = "yes"; then
|
||||
PIC_FLAG="-KPIC"
|
||||
fi
|
||||
fi
|
||||
|
||||
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
|
||||
;;
|
||||
|
||||
@ -24973,65 +24883,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
|
||||
CFLAGS="$CFLAGS -fno-common"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common"
|
||||
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
|
||||
PIC_FLAG="-dynamic -fPIC"
|
||||
;;
|
||||
|
||||
*-*-aix* )
|
||||
if test "$GCC" != "yes"; then
|
||||
# Extract the first word of "makeC++SharedLib", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$AIX_CXX_LD"; then
|
||||
ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
|
||||
fi
|
||||
fi
|
||||
AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD
|
||||
if test -n "$AIX_CXX_LD"; then
|
||||
echo "$as_me:$LINENO: result: $AIX_CXX_LD" >&5
|
||||
echo "${ECHO_T}$AIX_CXX_LD" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
|
||||
|
||||
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
||||
TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
|
||||
|
||||
PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
|
||||
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
|
||||
@ -25039,28 +24891,6 @@ fi
|
||||
LIBS="${LIBS} ${OPENGL_LIBS}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-beos* )
|
||||
SHARED_LD="${LD} -shared -o"
|
||||
;;
|
||||
|
||||
*-*-irix* )
|
||||
if test "$GCC" != "yes"; then
|
||||
PIC_FLAG="-KPIC"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
|
||||
*-*-sunos4* | \
|
||||
*-*-osf* | \
|
||||
*-*-dgux5* | \
|
||||
*-*-sysv5* )
|
||||
;;
|
||||
|
||||
*)
|
||||
{ { echo "$as_me:$LINENO: error: unknown system type $host." >&5
|
||||
echo "$as_me: error: unknown system type $host." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
esac
|
||||
|
||||
if test "x$WX_TARGET_LIBRARY" = "x"; then
|
||||
@ -34650,6 +34480,21 @@ fi
|
||||
COND_WXUSE_ZLIB_BUILTIN=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MAC_1="#"
|
||||
if test "x$PLATFORM_MAC" = "x1" ; then
|
||||
COND_PLATFORM_MAC_1=""
|
||||
fi
|
||||
|
||||
COND_SHARED_1="#"
|
||||
if test "x$SHARED" = "x1" ; then
|
||||
COND_SHARED_1=""
|
||||
fi
|
||||
|
||||
COND_SHARED_0="#"
|
||||
if test "x$SHARED" = "x0" ; then
|
||||
COND_SHARED_0=""
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@ -35514,7 +35359,6 @@ s,@PANGOX_CFLAGS@,$PANGOX_CFLAGS,;t t
|
||||
s,@PANGOX_LIBS@,$PANGOX_LIBS,;t t
|
||||
s,@PANGOXFT_CFLAGS@,$PANGOXFT_CFLAGS,;t t
|
||||
s,@PANGOXFT_LIBS@,$PANGOXFT_LIBS,;t t
|
||||
s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
|
||||
s,@RESCOMP@,$RESCOMP,;t t
|
||||
s,@DEREZ@,$DEREZ,;t t
|
||||
s,@SETFILE@,$SETFILE,;t t
|
||||
@ -35547,6 +35391,7 @@ s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
|
||||
s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
|
||||
s,@SO_SUFFIX@,$SO_SUFFIX,;t t
|
||||
s,@DLLPREFIX@,$DLLPREFIX,;t t
|
||||
s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
|
||||
s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
|
||||
s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
|
||||
s,@PIC_FLAG@,$PIC_FLAG,;t t
|
||||
@ -35616,6 +35461,9 @@ s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
|
||||
s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
|
||||
s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
|
||||
s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
|
||||
s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
|
||||
s,@COND_SHARED_1@,$COND_SHARED_1,;t t
|
||||
s,@COND_SHARED_0@,$COND_SHARED_0,;t t
|
||||
s,@LEX_STEM@,$LEX_STEM,;t t
|
||||
s,@PATH_IFS@,$PATH_IFS,;t t
|
||||
s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
|
||||
|
||||
116
configure.in
116
configure.in
@ -3036,70 +3036,11 @@ SHARED=0
|
||||
if test "$wxUSE_SHARED" = "yes"; then
|
||||
SHARED=1
|
||||
|
||||
dnl install targets
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
|
||||
else
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
|
||||
fi
|
||||
|
||||
dnl the extra compiler flags needed for compilation of shared library
|
||||
if test "$GCC" = "yes"; then
|
||||
dnl the switch for gcc is the same under all platforms
|
||||
PIC_FLAG="-fPIC"
|
||||
fi
|
||||
|
||||
|
||||
dnl use versioned symbols if available on the platform
|
||||
WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script])
|
||||
|
||||
dnl the command to use for creating the shared library
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
|
||||
case "${host}" in
|
||||
*-hp-hpux* )
|
||||
dnl default settings are good for gcc but not for the native HP-UX
|
||||
if test "$GCC" = "yes"; then
|
||||
dnl -o flag must be after PIC flag
|
||||
SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
|
||||
else
|
||||
dnl no idea why it wants it, but it does
|
||||
LDFLAGS="$LDFLAGS -L/usr/lib"
|
||||
|
||||
SHARED_LD="${CXX} -b -o"
|
||||
PIC_FLAG="+Z"
|
||||
fi
|
||||
|
||||
dnl install shared libs without symlinks
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WX_ALL_INSTALLED="preinstall_gl"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
|
||||
else
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-linux* | *-*-gnu* )
|
||||
if test "$GCC" != "yes"; then
|
||||
AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
|
||||
[
|
||||
AC_TRY_COMPILE([],
|
||||
[
|
||||
#ifndef __INTEL_COMPILER
|
||||
#error Not icc
|
||||
#endif
|
||||
],
|
||||
wx_cv_prog_icc=yes,
|
||||
wx_cv_prog_icc=no
|
||||
)
|
||||
])
|
||||
if test "$wx_cv_prog_icc" = "yes"; then
|
||||
PIC_FLAG="-KPIC"
|
||||
fi
|
||||
fi
|
||||
|
||||
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
|
||||
;;
|
||||
|
||||
@ -3141,40 +3082,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
dnl For Unix to MacOS X porting instructions, see:
|
||||
dnl http://fink.sourceforge.net/doc/porting/porting.html
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
|
||||
CFLAGS="$CFLAGS -fno-common"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common"
|
||||
dnl wxWindows must be fully binded (lazy binding breaks RTTI classinfo)
|
||||
dnl this can be done either with the exe linker flag -Wl,-bind_at_load
|
||||
dnl or with a double stage link in order to create a single module
|
||||
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
|
||||
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
|
||||
PIC_FLAG="-dynamic -fPIC"
|
||||
;;
|
||||
|
||||
*-*-aix* )
|
||||
dnl default settings are ok for gcc
|
||||
if test "$GCC" != "yes"; then
|
||||
dnl the abs path below used to be hardcoded here so I guess it must
|
||||
dnl be some sort of standard location under AIX?
|
||||
AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
|
||||
makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
|
||||
|
||||
SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
|
||||
|
||||
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
||||
TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
|
||||
|
||||
PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
|
||||
|
||||
dnl Don't build seperate GL library
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
@ -3183,30 +3091,6 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
LIBS="${LIBS} ${OPENGL_LIBS}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-beos* )
|
||||
dnl can't use gcc under BeOS for shared library creation because it
|
||||
dnl complains about missing 'main'
|
||||
SHARED_LD="${LD} -shared -o"
|
||||
;;
|
||||
|
||||
*-*-irix* )
|
||||
dnl default settings are ok for gcc
|
||||
if test "$GCC" != "yes"; then
|
||||
PIC_FLAG="-KPIC"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
|
||||
*-*-sunos4* | \
|
||||
*-*-osf* | \
|
||||
*-*-dgux5* | \
|
||||
*-*-sysv5* )
|
||||
dnl defaults are ok
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_MSG_ERROR(unknown system type $host.)
|
||||
esac
|
||||
|
||||
dnl set target to shared if not explicitly chose static before
|
||||
|
||||
Loading…
Reference in New Issue
Block a user