AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no need for --enable-soname anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-25 19:54:06 +00:00
parent 1936dc8b29
commit 86ec293520
6 changed files with 5 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
configure vendored
View File

@ -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 WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR 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_SHARED_1_MONOLITHIC_0 COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_GUI_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_TOOLKIT_GTK COND_TOOLKIT_MSW COND_TOOLKIT_MAC COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBTIFF_BUILTIN COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_MONOLITHIC_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_0 COND_SHARED_1_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_0 COND_BUILD_DEBUG COND_DEPS_TYPE_GCC COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_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 CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX SONAME_FLAGS SONAME_FLAGS_GL WX_TARGET_LIBRARY_SONAME 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 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 AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR 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_SHARED_1_MONOLITHIC_0 COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_GUI_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_TOOLKIT_GTK COND_TOOLKIT_MSW COND_TOOLKIT_MAC COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBTIFF_BUILTIN COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_MONOLITHIC_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_0 COND_SHARED_1_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_0 COND_BUILD_DEBUG COND_DEPS_TYPE_GCC COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_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 CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX 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 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.
@ -871,7 +871,6 @@ Optional Features:
--enable-nanox use NanoX
--enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)
--enable-shared create shared library code
--enable-soname set the DT_SONAME field in ELF shared libraries
--enable-optimise create optimised code
--enable-debug same as debug_flag and debug_info
--enable-precomp enable use of precompiled headers (Mac OS X/Darwin)
@ -1944,7 +1943,6 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_SONAME=no
DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
@ -2119,7 +2117,6 @@ else
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_SONAME=no
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
@ -3052,47 +3049,6 @@ echo "${ECHO_T}no" >&6
fi
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-soname" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-soname... $ECHO_C" >&6
no_cache=0
# Check whether --enable-soname or --disable-soname was given.
if test "${enable_soname+set}" = set; then
enableval="$enable_soname"
if test "$enableval" = yes; then
ac_cv_use_soname='wxUSE_SONAME=yes'
else
ac_cv_use_soname='wxUSE_SONAME=no'
fi
else
LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME
fi;
eval "$ac_cv_use_soname"
if test "$no_cache" != 1; then
echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp
fi
if test "$wxUSE_SONAME" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6
@ -24907,11 +24863,6 @@ echo "${ECHO_T}$wx_cv_prog_icc" >&6
fi
fi
if test "$wxUSE_SONAME" = "yes" ; then
SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
fi
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
;;
@ -25015,8 +24966,6 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
else
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
fi
;;
@ -25027,8 +24976,6 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$CXXFLAGS -fno-common"
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
PIC_FLAG="-dynamic -fPIC"
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
@ -34713,9 +34660,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
@ -35564,9 +35508,6 @@ s,@WX_ALL_INSTALLED@,$WX_ALL_INSTALLED,;t t
s,@SHARED_LD@,$SHARED_LD,;t t
s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t
s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t
s,@SONAME_FLAGS@,$SONAME_FLAGS,;t t
s,@SONAME_FLAGS_GL@,$SONAME_FLAGS_GL,;t t
s,@WX_TARGET_LIBRARY_SONAME@,$WX_TARGET_LIBRARY_SONAME,;t t
s,@WX_TARGET_LIBRARY_TYPE@,$WX_TARGET_LIBRARY_TYPE,;t t
s,@STATIC_FLAG@,$STATIC_FLAG,;t t
s,@WXDEBUG_DEFINE@,$WXDEBUG_DEFINE,;t t

19
configure.in
View File

@ -336,7 +336,6 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_SONAME=no
DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
@ -511,7 +510,6 @@ else
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_SONAME=no
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
@ -744,7 +742,6 @@ dnl compile options
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED)
WX_ARG_ENABLE(soname, [ --enable-soname set the DT_SONAME field in ELF shared libraries], wxUSE_SONAME)
WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE)
WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
@ -3103,12 +3100,6 @@ if test "$wxUSE_SHARED" = "yes"; then
fi
fi
if test "$wxUSE_SONAME" = "yes" ; then
SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
dnl substitute this in makelib.env for the contrib libs
WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
fi
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
;;
@ -3146,8 +3137,6 @@ if test "$wxUSE_SHARED" = "yes"; then
else
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
fi
;;
@ -3164,11 +3153,6 @@ if test "$wxUSE_SHARED" = "yes"; then
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"
dnl library installation base name and wxMac resources file base name
dnl must be identical in order for the resource file to be found at
dnl run time in src/mac/app.cpp
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
@ -5669,9 +5653,6 @@ AC_SUBST(PIC_FLAG)
AC_SUBST(CODE_GEN_FLAGS)
AC_SUBST(CODE_GEN_FLAGS_CXX)
AC_SUBST(SONAME_FLAGS)
AC_SUBST(SONAME_FLAGS_GL)
AC_SUBST(WX_TARGET_LIBRARY_SONAME)
AC_SUBST(WX_TARGET_LIBRARY_TYPE)
AC_SUBST(STATIC_FLAG)

2
wxBase.spec
View File

@ -51,7 +51,7 @@ fi
mkdir obj-shared
cd obj-shared
../configure --prefix=%{pref} --enable-soname --disable-gui --disable-std_iostreams
../configure --prefix=%{pref} --disable-gui --disable-std_iostreams
$MAKE
cd ..

2
wxGTK.spec
View File

@ -65,7 +65,7 @@ fi
mkdir obj-shared
cd obj-shared
../configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl
../configure --prefix=%{pref} --with-odbc --with-opengl
$MAKE
cd ..

2
wxMGL.spec
View File

@ -58,7 +58,7 @@ fi
mkdir obj-shared
cd obj-shared
../configure --prefix=%{pref} --enable-soname --with-mgl
../configure --prefix=%{pref} --with-mgl
$MAKE
cd ..

2
wxMotif.spec
View File

@ -64,7 +64,7 @@ fi
mkdir obj-shared
cd obj-shared
../configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl --with-motif
../configure --prefix=%{pref} --with-odbc --with-opengl --with-motif
$MAKE
cd ..