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

Get rid of WXCONFIG_ONLY_CPPFLAGS variable in configure

Browse Source 
This variable was set and used exactly once, so just remove it to
simplify things.

No real changes.
This commit is contained in:
Vadim Zeitlin
2020-02-02 01:28:29 +01:00
parent 6697b576b2
commit 13b0981eb9
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -28671,8 +28671,6 @@ EOF
esac esac
fi fi
WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
if test $wxUSE_RPATH = "no"; then if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG='' SAMPLES_RPATH_FLAG=''
DYLIB_PATH_POSTLINK='' DYLIB_PATH_POSTLINK=''
@@ -37726,8 +37724,9 @@ CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS ` OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS `
OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS ` OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS `
WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` if test "SHARED" = 1; then
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DWXUSINGDLL"
fi
LIBS=`echo $LIBS` LIBS=`echo $LIBS`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"

13
configure.in
View File

@@ -3785,10 +3785,6 @@ EOF
esac esac
fi fi
dnl this one shouldn't be used for the library build so put it in a
dnl separate variable from WXCONFIG_CPPFLAGS
WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
if test $wxUSE_RPATH = "no"; then if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG='' SAMPLES_RPATH_FLAG=''
DYLIB_PATH_POSTLINK='' DYLIB_PATH_POSTLINK=''
@@ -7954,8 +7950,9 @@ OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS `
dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config
dnl only stuff to it dnl only stuff to it
WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` if test "SHARED" = 1; then
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DWXUSINGDLL"
fi
LIBS=`echo $LIBS` LIBS=`echo $LIBS`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
@@ -8309,10 +8306,6 @@ dnl are used when building the libraries using the library
dnl dnl
dnl so put anything which should be used only during the library build in, e.g. dnl so put anything which should be used only during the library build in, e.g.
dnl CXXFLAGS, but put everything else (by default) into WXCONFIG_CXXFLAGS dnl CXXFLAGS, but put everything else (by default) into WXCONFIG_CXXFLAGS
dnl
dnl and, finally, for some things which should be only used by wx-config but
dnl not during the library compilation, use WXCONFIG_ONLY_CPPFLAGS which is
dnl added to WXCONFIG_CPPFLAGS after adding the latter to CPPFLAGS
AC_SUBST(WXCONFIG_CPPFLAGS) AC_SUBST(WXCONFIG_CPPFLAGS)
AC_SUBST(WXCONFIG_CFLAGS) AC_SUBST(WXCONFIG_CFLAGS)
AC_SUBST(WXCONFIG_CXXFLAGS) AC_SUBST(WXCONFIG_CXXFLAGS)