Commit Graph

40 Commits

Author SHA1 Message Date
Vadim Zeitlin
d69cfb083e Work around an apparent autoconf bug in WX_CONFIG_CHECK
Don't use "$4" inside m4 comment, as autoconf 2.69 somehow completely mangles
the generated configure when the 4th argument is indeed specified: we end up
with a part of this comment in the generated file.
2017-01-08 15:42:41 +01:00
Dévai Tamás
29c81ad515 Allow wxwin.m4 finding and using a base-only library
Although "base" is not actually a toolkit, allow both the automatic toolkit
detection and the configure flag --with-toolkit=base find and use a base-only
library.

Closes https://github.com/wxWidgets/wxWidgets/pull/310
2016-07-30 23:02:43 +02:00
Vadim Zeitlin
d72006f5b8 Don't force the use of DEBUG on application in autoconf macros
If WX_STANDARD_OPTIONS() is not used, we shouldn't add any debugging nor
optimization options to C{,XX}FLAGS as the application presumably handles it
on its own, it was completely unexpected to see -O2 appear in CXXFLAGS.

Fix this by only doing anything if DEBUG variable is defined. Even this is not
optimal as it's such a common name that it could clash with an unrelated
variable in the application configure script, but doing anything else risks
breaking existing scripts relying on it being named like this.
2015-09-20 02:23:06 +02:00
Vadim Zeitlin
d501395ee0 Fix handling of unspecified build options in wxwin.m4
There were many problems if some options selecting the build of wxWidgets to
use were not specified at all, i.e. if the corresponding string was not used
in WX_STANDARD_OPTIONS() argument or if WX_STANDARD_OPTIONS() was not used at
all (which is perfectly possible and allowed).

In this case, the output of WX_STANDARD_OPTIONS_SUMMARY_MSG() was corrupted
(e.g. it could output "WX_DEBUG is" without any value and "PORT:" value was
empty) and, worse, as that macro is only cosmetic, WX_LIKE_LIBNAME() didn't
work correctly neither, making it difficult to check for the libraries using
it to construct their name (as many libraries from wxCode do).

Get rid of all these problems by simply treating empty/undefined variables as
meaning "auto detect" instead of having to set them to the special "auto"
value first. This makes sense as now we have just 3 states: 0, 1 or null,
instead of previous 4 (+ "auto") and is much more robust.
2015-08-31 02:16:01 +02:00
Vadim Zeitlin
e36874d4f9 Fix nonsensical handling of TOOLKIT in wxwin.m4
The code set WX_PORT to $TOOLKIT only if the latter was empty which made no
sense and also set WX_PORT to the never used nor documented anywhere else
$PORT if $TOOLKIT was not empty which made even less of it.

Just assign $TOOLKIT to WX_PORT if the former has a valid value.
2015-08-31 01:57:48 +02:00
Vadim Zeitlin
6bfea22363 No real changes, just slightly simplify a macro in wxwin.m4
Remove the never used 4th and 5th arguments of _WX_SELECTEDCONFIG_CHECKFOR
macro.

Also update the comment to better explain what does the macro actually do: it
doesn't "output the message" but rather sets a variable, with the message
being an optional side effect.
2015-08-31 01:43:21 +02:00
Vadim Zeitlin
bff235c918 Recognize GTK3 port in helper autoconf macros.
Allow "gtk3" as a value of --with-toolkit option and recognize it correctly
when auto-detecting toolkit from `wx-config --selected-config` output.
2015-08-28 18:58:25 +02:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
eff97cba04 Update OS X toolkit names list in wxwin.m4.
There is no more "mac" toolkit in 2.9, we have "osx_carbon" and "osx_cocoa"
instead (and also "osx_iphone" but it's not used with configure so far).

Closes #13817.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:27:57 +00:00
Vadim Zeitlin
0e1f8ea4a3 Remove wxMGL port.
The company behind MGL toolkit (SciTech) doesn't exist since several years and
this port is not used by anybody, so remove it to ease maintenance burden.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 14:46:41 +00:00
Vadim Zeitlin
4d4363d200 Add AM_PATH_WXRC to wxwin.m4 for backwards compatibility.
Although the new WXRC_CHECK is preferred, still allow using AM_PATH_WXRC for
the applications which need to build in both 2.8 and 2.9 environments.

Closes #12069.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-18 10:29:58 +00:00
Francesco Montorsi
124a5e3e6a update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config --selected_config command
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-22 15:44:30 +00:00
Vadim Zeitlin
aa1c09fe1c remove mentions of contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-01 22:39:57 +00:00
Francesco Montorsi
5e5b46bb96 set BUILD variable to release not only when DEBUG is empty but also when it contains 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-20 10:58:24 +00:00
Francesco Montorsi
0edfe8f7e3 fixed setting BUILD variable in any case (not only when DEBUG=auto)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-14 13:35:37 +00:00
Francesco Montorsi
f9f73163e1 fixed the WX_VERSION name clash renaming the variable in major.minor form as WX_RELEASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-14 13:31:58 +00:00
Vadim Zeitlin
2f3584b169 fix bug with mistakenly recognising 'wxdebug' as 'debug' and 'wxshared' as 'shared' (patch 1787101)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-09 21:45:58 +00:00
Vadim Zeitlin
731eee9af2 rename WX_VERSION_FULL back to WX_VERSION
WX_VERSION was renamed to WX_VERSION_FULL for some reason in rev 44731 but
this was a backwards incompatible change as the existing configure scripts
could (and did) use WX_VERSION, so undo this change, at least until someone
finds a worthy reason for it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-14 22:28:44 +00:00
Vadim Zeitlin
a8571f4e02 don't use the extra libraries in wx-config --version invocation as this now (correctly) results in errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-14 22:21:29 +00:00
Vadim Zeitlin
fb5b13210e quote AM_PATH_WXCONFIG arguments before passing them to WX_CONFIG_CHECK, otherwise they're lost when using autoconf 2.13
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-03 01:02:05 +00:00
Vadim Zeitlin
33e61c47c0 add many new macros to facilitate using wx from projects using bakefile presets; use more consistent names for the existing macros (in particular, AM_OPTIONS_WXCONFIG and AM_PATH_WXCONFIG have been deprecated in favour of WX_CONFIG_OPTIONS and WX_CONFIG_CHECK) (patch 1604462)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-10 17:35:05 +00:00
Vadim Zeitlin
9a32689b37 remove non existing AM_OPTIONS_WXRC: it results in an error with aclocal 1.4, even though it's inside a comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-03 17:10:29 +00:00
Julian Smart
692ebda6c7 Applied patch [ 1372332 ] Support for WX_RESCOMP to allow MSYS+wx-config to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:51:45 +00:00
Václav Slavík
ed33d5241a added AM_PATH_WXRC (based on patch 1212816)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-01 20:02:47 +00:00
Václav Slavík
128c8706a0 s/wxWindows/wxWidgets/g
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-01 16:53:40 +00:00
Julian Smart
80f3a6b0aa Applied patch [ 1204497 ] fixes for wxwin.m4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-22 14:42:31 +00:00
Vadim Zeitlin
a1d47842fc fixed static libs detection (shouldn't suppress stdout, just stderr)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-17 08:57:09 +00:00
Vadim Zeitlin
838518be7e suppress output of wx-config --static to fix problems introduced by wx-config rewrite
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-16 11:56:52 +00:00
Ron Lee
3f45f8bf3d Eliminate the redundant no_wx var and the extra test to set it.
Don't perform unrelated tests inside a single CHECK/RESULT block.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 13:23:09 +00:00
Václav Slavík
48112931db fixes to wx-config config name matching
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-21 10:17:51 +00:00
Václav Slavík
8708fa7618 *** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-18 11:19:34 +00:00
Václav Slavík
04bd3f56d2 adapted to wx-config libraries list changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-18 10:55:22 +00:00
Václav Slavík
79f8a0d85f make aclocal-1.8 happy (patch 930105)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-06 07:53:23 +00:00
Václav Slavík
c5be79d910 AM_PATH_WXCONFIG takes 4th argument with libs list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-30 15:48:55 +00:00
Vadim Zeitlin
5ff72dc423 added --with-wxdir=DIR option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 12:04:07 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Julian Smart
8dafe2c7d5 Incremented version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-20 11:51:14 +00:00
Václav Slavík
8e1aefe0f2 fixes to
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-24 21:11:46 +00:00
Václav Slavík
6302ab2fa9 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-23 00:14:31 +00:00
Václav Slavík
debc175a42 added AM_PATH_WXCONFIG macro and its installation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-24 23:55:29 +00:00