Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always return just "$CXX -o" from wx-config --ld instead of returning the

Browse Source 
command needed to link a shared library (if this is really needed, we should
add another --shared-ld option for this) as it isn't suitable for linking the
user applications


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-20 15:59:05 +00:00
parent c0030ca789
commit 99d4fdfdcc
3 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 49043 2007-10-04 15:59:09Z MW .
# From configure.in Id: configure.in 49200 2007-10-17 17:55:25Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -1003,7 +1003,6 @@ WXCONFIG_LIBS
WXCONFIG_RPATH
WXCONFIG_LDFLAGS_GUI
WXCONFIG_RESFLAGS
EXE_LINKER
GUIDIST
DISTDIR
SAMPLES_SUBDIRS
@@ -52988,10 +52987,6 @@ if test "$wxUSE_MAC" = 1 ; then
fi
if test "$wxUSE_SHARED" = "yes"; then
sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
@@ -53000,10 +52995,6 @@ if test "$wxUSE_SHARED" = "yes"; then
cp -p ${srcdir}/src/os2/dllar.sh .
;;
esac
else
EXE_LINKER="$CXX -o"
fi
if test "$wxUSE_OMF" = "yes"; then
case "${host}" in
@@ -53098,7 +53089,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -54487,7 +54477,7 @@ WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
EXE_LINKER!$EXE_LINKER$ac_delim
GUIDIST!$GUIDIST$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54529,7 +54519,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
GUIDIST!$GUIDIST$ac_delim
DISTDIR!$DISTDIR$ac_delim
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
@@ -54551,7 +54540,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5