Commit Graph

157 Commits

Author SHA1 Message Date
Vadim Zeitlin
01f9accd19 Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 23:56:58 +00:00
Vadim Zeitlin
4bc5652e57 Fix wx-config --libs in monolithic build.
Don't include non-existent libraries (which are built as part of the main
monolithic one) in this case.

Closes #15567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-26 14:08:18 +00:00
Paul Cornett
9ad8907103 slight simplification: use another sed expression instead of running tr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-16 17:09:07 +00: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
e6d7f1efce Quote variables in -z tests correctly in wx-config.
The changes of r69944 broke wx-config for the traditional Unix systems (at
least Solaris and AIX, probably others too) which don't support using -z
without any value (unlike Linux/bash).

Fix this by quoting the possible empty variables in the tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 21:41:36 +00:00
Vadim Zeitlin
e0e022b067 Order the libraries correctly in wx-config for static linking.
The order of libraries matters when linking statically under UNIX. Ensure that
it is always correct in wx-config itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 16:13:26 +00:00
Robin Dunn
b4f28d1ef6 Fix popen2 deprecation warning.
Fix binary name inside the framework to be the same as the framework name.
Inject a bit of info about the framework into wx-config, so it can output framework flags/names instead of lib flags/names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-29 20:03:45 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +00:00
Vadim Zeitlin
d4fbe1d85c Don't include LDFLAGS in wx-config --libs output.
Use a separate WXCONFIG_LDFLAGS variable for the flags which should be used
when linking applications using wxWidgets and not wxWidgets itself.

The only intentional effect this change is supposed to have right now is that
-arch options added to LDFLAGS when building wx for multiple architectures
under OS X are not used for building the applications any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-19 13:57:41 +00:00
Vadim Zeitlin
0df5d67316 Use portable comparison syntax in wx-config.
"==" is not portable in test and while it works in most shells, it fails in
dash. Fix it by using "=".

Closes #11349.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-19 09:17:39 +00:00
Vadim Zeitlin
c06957daf1 Restore --debug wx-config option handling for pre-2.9 builds.
Although 2.9 and later doesn't have debug/release distinction, previous
version of wx may be installed on the system and should be usable via 2.9
wx-config so honour this option for them.

Closes #11316.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-17 22:56:07 +00:00
Vadim Zeitlin
89b1afb48f Change Unix build system to not use debug build any more.
Remove "d" suffix from the libraries and the BUILD variable which is not used
any longer.

Also ignore (but still support, for compatibility) --debug option in wx-config.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-12 11:29:31 +00:00
Vadim Zeitlin
e5405b6b21 added new wx-config --query-xxx options and use them in (Unix) bakefile presets instead of parsing --selected-config output to fix the use of presets when cross-compiling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 17:26:11 +00:00
Francesco Montorsi
de0573dabb do not exceed the 80 column limit when printing the list of available libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-18 10:42:19 +00:00
Václav Slavík
ed33cad79e Removed too strict check from wx-config that prevented wxwin.m4 from wx-2.8
from working with trunk version of wx (the "Extra unknown input
parameters : $input_parameters" error).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 18:54:25 +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
Stefan Neis
6ab7f7786a Blind fix to improve wx-config's Bourne shell compatibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-13 18:41:44 +00:00
Vadim Zeitlin
1342e47ccb ignore any extra arguments after --version for compatibility with the configure scripts created using 2.8 wxwin.m4 version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-17 00:20:26 +00:00
Francesco Montorsi
ccde70089d don't give out an error when using --cflags followed by a list of libraries; this happens for example in the WX_CONFIG_CHECK macro in wxwin.m4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-15 18:06:28 +00:00
Vadim Zeitlin
1e6b2edfc8 remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 13:40:27 +00:00
Vadim Zeitlin
99d4fdfdcc always return just "$CXX -o" from wx-config --ld instead of returning the
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
2007-10-20 15:59:05 +00:00
Vadim Zeitlin
f2b1c98a00 use decho, not echo, to output error messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-14 22:26:26 +00:00
Vadim Zeitlin
6bddfdbf19 don't output -DwxUSE_GUI=0 in cflags by default, do output it if 'base' is specified after cflags option (patch from John Labenski)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-11 21:54:51 +00:00
Vadim Zeitlin
bd63020652 added --optional-libs wx-config argument (patch 1747239)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-10 10:28:12 +00:00
Robin Dunn
cf63f3d3ae More patches from FM to clean up after moving contribs. Also removes
use of wxUSE_RESOURCES


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-06 21:08:30 +00:00
Vadim Zeitlin
16837dc334 document --selected-config option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-24 01:20:33 +00:00
Michael Wetherell
5719eab2bf Fix missing 3rd party builtin libs for static monolithic builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-17 09:07:07 +00:00
Michael Wetherell
ac2e7107d3 Fix missing semicolon from last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-09 08:50:17 +00:00
Michael Wetherell
b2f55c8b71 Make Bourne compatible.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-04 12:39:55 +00:00
Ron Lee
a55d039a23 Output deprecated warning for --rezflags and permanently disable it.
Remove WXCONFIG_POSTLINK_COMMAND that existed only for it.
Make the explanation more explanatory.  This is not an invitation
for stray options and script helpers to do a little 'open mike',
its a holding ground for nasty things we still need to fix.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 06:36:05 +00:00
Julian Smart
3f97aec58a Made explanation more concise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 08:57:05 +00:00
Ron Lee
004ee6daa7 Fix include dirs for windres, enable emxbind to actually produce output,
restore RESCOMP for backward compatibility and forward availability.
Check for windres again.  Whatever bakefiles do with it, they do not
make it available to configure.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 05:17:05 +00:00
David Elliott
891ace0538 Separate RESCOMP into WINDRES (for Win32) and REZ (for Mac OS).
Don't check for windres as bakefile.m4 now does it properly.
Rename MACRESCOMP to POSTLINK_COMMAND.
Rename MACRESWXCONFIG to WXCONFIG_POSTLINK_COMMAND.
Use newest bakefile.m4 (with similar changes).
Add --rezflags option back to wx-config so existing user Makefiles don't break.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 04:51:08 +00:00
Ron Lee
370d2fd7cc Minimal implementation of --rescomp option for wx-config,
required for building windows resource files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 05:10:09 +00:00
Vadim Zeitlin
5ff751d600 autumn cleanup of configure:
1. we now consistently use WXCONFIG_C[PP|XX]_FLAGS instead of a mix of CODE_GEN_FLAGS
   plus tons of ad hoc variables (TOOLCHAIN_DEFS, WX_LARGEFILE_FLAGS, WXDEBUG_DEFINE
   and so on) which could all be simply removed now

2. output more stuff which used to be in CFLAGS only in wx-config output:
 a) pthread options (they are needed for user code compilation too)
 b) -D__STDC__EXT needed under HP-UX, this should finally fix the build there

3. also removed GCC_PRAGMA_FLAGS which is unused any more

4. use consitent naming for a couple of other variables


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 02:06:16 +00:00
Ron Lee
6758d3d3a3 Add --selected_config option for reporting to secondary build configration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-03 06:28:23 +00:00
Robert Roebling
ddd14b1483 Reverted GCC_NO_PRAGMA change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-29 13:26:45 +00:00
Ron Lee
8c53958268 Fix the test for NO_GCC_PRAGMA to be faster and more accurate.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-17 14:57:13 +00:00
Stefan Neis
1aa3e471fe Improved support for OS/2's ancient version of "ash" - since it is about
20% faster on configure than up-to-date (pd)ksh ports it's worth
        this small change, IMHO.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 17:00:48 +00:00
Ron Lee
8ec45325ea Add extra^2 debug mode to wx-config for brute force one pass debugging
of new platforms.

Import $EGREP from configure, posix `grep -E` is not endemic yet.

Clean up debian/rules for removed afm files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 08:53:36 +00:00
Ron Lee
eb57b07a27 Not quite as flexible, but lighter and sufficient.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-22 06:27:25 +00:00
Ron Lee
3838e2d36e Only filter out duplicate -libraries. Let other constructs
fend for themselves.  This will avoid hiding problems in
configure.in and let the mac users have -framework et al.
pass through as they should.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-22 05:38:18 +00:00
Ron Lee
d9809627ad Don't shoot the messenger. Reverted the previous 'silent treatment' patch,
users should be informed of things that go wrong, when they go wrong, without
having to figure out what cold silence means in that context from other clues.

If broken configure scripts perform unnecessary tests, or clever ones want
to perform them silently, then they should redirect stderr to /dev/null like
all other well behaved tools might.

Fixed bug diagnosed by Fritz Elfert where an explicit --host specification to
configure was not properly ignored for native builds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 05:01:23 +00:00
Vadim Zeitlin
bd4ed40fed fail silently if the requested wx-config is not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-08 14:37:20 +00:00
Ron Lee
92ea30ce14 Patch from Paul Cornett, clean up side effects in obtaining legacy
config and remove unneccessary line continuations et al.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 05:01:46 +00:00
Ron Lee
68ca6f5252 Applied patch 1055774 from Paul Cornett for platforms
without a posix /bin/sh.  Among those reported as not yet
expired are Solaris 9, IRIX 6.5, and Tru64 5.1b.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 02:00:23 +00:00
Ron Lee
ffa0583fbf Update for rpath with uninstalled builds and utility search.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 06:25:12 +00:00
Vadim Zeitlin
fc2739d5f0 added --linkdeps switch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-17 00:38:31 +00:00
Ron Lee
8dabd665bd Don't leak intermediate results of tests for wx2.4 if it is not installed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-12 13:16:03 +00:00
Ron Lee
63f018eb41 Add basic --utility option for finding build dependent utils.
More strictly define the exit codes -- 0 for success, 1 for failure,
2 for options that are not supported -- so as to enable feature testing.
Quote the mac rezflags hack.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 12:08:05 +00:00