Commit Graph

142 Commits

Author SHA1 Message Date
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
Ron Lee
6a9046db1e Use the same paranoia we already apply to lib lists we get from configure
to those we get from the user on the command line.  Bubble all duplicates
to occur at their last mention so static linking order is satified.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 12:13:02 +00:00
Ron Lee
22642fb2b8 Filter any arguments back to 2.4.2.6 syntax before
handing them on to a legacy wx-config.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 16:10:54 +00:00
Ron Lee
a13a7f891a Add support for legacy 2.4 installs to wx-config.
Add /utils/wxrc to the dist target and fix some things that still
think it is in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-01 13:28:25 +00:00
Ron Lee
148e141b23 Enable concurrent installs of runtime packages after a soname change.
Add a common package for afm metrics, and other 'static' data and utilities.
Remove the version/flavour from afm installs on unix as discussed with Vaclav,
these files really do never change.
Mention --static along with other selection options in --help.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 14:47:08 +00:00
Ron Lee
3950ea80e8 Make the warnings a little more relevant in other contexts
in which they may be seen.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 04:30:39 +00:00
Ron Lee
1320281c89 Handle the case of unresolveable ambiguity in --list now too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 08:08:02 +00:00
Ron Lee
9a09819ad9 Delay --list a little longer so we can indicate the best match
out of the general blob.  Format the output a little less ambiguously.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 05:57:14 +00:00
Ron Lee
0506bbbfdf Undo the link creation in builddir. contrib is still going to be
here for a while so there isn't much paydirt in working around the
problems on platforms with limited filesystems at this stage.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-25 11:56:48 +00:00
Ron Lee
ecd16d74ce Get rid of the symlink farm in $builddir too, contrib is here
to stay for a while.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 16:00:21 +00:00
Ron Lee
9103d280f9 Install the config files for cross debs under /usr/$(host), but link them
to the default system location under /usr.  This way the commands:
wx-config --prefix=/usr/$(host) and wx-config --prefix=/usr --host=$(host)
are much more congruent in their action.

Another nail in the coffin for inplace hacks.  Link $srcdir/include to
the build dir so that --prefix=$build_dir really does point to a
realistic looking installed development environment.  I don't know why
I didn't do this instead of (ab)using --exec-prefix to 'fix' this
simple omission for so long.  Probably because it is much more obvious
if contrib is out of the picture.  That makes it a little more work
right now, but long term this is a very clean and correct thing to do.
It completely absolves us of the two independent variables problem,
and of the tree becoming bogus without actually being stale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 20:29:51 +00:00
Ron Lee
5636172bce Filter out the 'std' pseudo-lib from monolithic builds too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 23:46:54 +00:00
Ron Lee
ceec2216bd wx-config2.6
Designed to be resiliant against future cut and paste coders.  Any
gnarly parts are black boxed away nicely to avoid accidents and have
integrated debugging support for trivial sanity checking in the event
of modification or trouble.  In this way the major operations are all
cleanly separated making any or all of them simply extensible, or
replaceable in the face of future needs.  Functions now all have api
descriptions.  If you rely on a function to act in some way, please
document it to safeguard yourself against inadvertant interface
changes by others.

Everything now runs top top to bottom, we don't try to output things
as fast as we can read them anymore, instead we read everything in,
sort over it just once without the need for 'just in case' temp's, and
then output whatever we were asked for only when we are sure we have
the correct answer.  Almost all key data aims to be constant past the
point of its initialisation so side effect creep and trouble with half
(re)initialised data should be significantly reduced in future.  In
almost every case it is easy and clean to simply delay initialisation
until all required input channels have been emptied.  If you like,
think of it as mostly being one big constructor, with a little
destructor at the end which outputs what you requested.  At core, it
is simply a generated config file -- with some user friendly logic for
extracting its data and finding related files.

Removed references to --gl-libs in --help.  It still exists, but if
its deprecated, no need to fill space in a compact help summary.  It
will remain documented (as deprecated) in the man page.

Removed references to arcane order rules for arguments.  Those
limitations don't exist anymore, though the options are backward
compatible in all other respects from the user pov.

Removed references to --inplace, it doesn't need to be in the summary
help either.  It also is still accepted as an option, but there is no
value in passing it, an uninstalled wx-config will automatically
behave correctly.  When you need --inplace, it will supply that
behaviour for you (but there is no harm in typing it your self in that
case).  If you do type it when you don't need it, bad things will
probably happen just like they always would have.

Along with items above, generally compressed --help text to fit on
even a traditional sized terminal without the need for paging.  If we
want more detailed help built in, it should be broken into separate
pages, and this would be a trivial extension.

Command line input is now controlled by a small generic parser.  You
define what options you want and what groups you want them in by
initialising them as lists.  It runs over all the input and fills
corresponding psuedo-hashes from it for you to use as you please
later.

Added a validator for it to check yes/no options.

Use posix extended regex instead of gnu 'basic' regex extensions,
grep -E is portable, if gmake is not a requirement, we surely can't
push gnu grep on people.

Made --list more user friendly.  It will now always list the current
wx-config if it matches the feature spec, though it will warn if that
config is not in the specified --prefix.  Alternate configs that match
(if any) are listed separately. An unqualified call to wx-config --list
will always return (at least) the config that was called.  We can never
have a 'hanging' wx-config shell with no real implementation to back
it up anymore so we can always return a sensible result for the user.
A wx-config anywhere can list (and hence use) the configs installed in
any (other) prefix.

Delegation.  Too big a topic to remark on in depth here, see the code
for a fuller description.  With everything being nicely constant and
aligned to the respective library build, then aside from delegation,
wx-config really is _just_ a config file (albeit with a layer of logic
around the constants), and each wx-config carries a set of defaults
which match perfectly the library build that it was generated with.
If you choose a set of features that it can match, it will answer all
your queries for them, if it cannot, it will seek to delegate to the
config that is most like itself, but which can supply all the features
you specified.  This should be completely compatible with any set of
options that returned a sensible result previously, and produce a
sensible result in many cases where previously the collating order
of your locale or the nuances of your filesystem operations would
decide which library it thought you wanted.

Sort duplicates out of the list of libraries and trickle shared
dependencies down the list to properly support static builds.

Added the inplace-config tweak for use in the build tree.  This works
like any other config, except it presets the default prefix to point
at the build dir instead of the configured prefix that will become the
default if this build is installed.  It provides the behaviour of
--inplace when $build_dir/wx-config is called without also specifying
a different --{exec-,}prefix or any feature flags that it is
incompatible with.  In that event, it will try to delegate as per the
normal rules.

The inplace wrapper is not installed with the primary config which
cleanly disables it for system installs.  It will be invalidated if
the build (or source) dir is moved, but will be revalidated if the
build tree is subseqently updated with ./config.status --recheck &&
config.status (which it probably would need to be to build anyway for
other reasons at present too)

Enabled full support for static builds again, promoted --static to a
full feature option.  Fixed --ld to return something for them too.

Added --flavour, similar to the existing --vendor, but for autoconf
builds.  These will probably want to be streamlined further.
Broadened the use of release and flavour labels to support better
concurrent installs.

Fix bit rot in make-dist due to new/deleted files.

Whittled down the number of obsolete and duplicated substitution
variables in configure.in, and lowercased some variables we no longer
export for substitution.  Use the autoconf macros to generate files
where we want them instead of making them someplace and then moving
them all about.  Remove extra files and symlinks added for the two
part wx-config version.

Removed the debian -contrib packages.  We'll use multi-lib support
to manage them from now on and indiviual libs can be split out along
functional lines if required.  This means the retained contribs will
now get __WXDEBUG__ versions packaged too.

Removed conflicts from almost packages except i18n and wxPython. All
packages now either update or install alongside any existing ones.

Added support for flavoured debs as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 17:16:29 +00:00
Václav Slavík
c39ee0ad46 don't output -DwxUSE_GUI=0 in monolithic build, setup.h will take care of setting it correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-08 16:30:03 +00:00
Stefan Neis
2001ecbc76 Fixed typo reported by Ian Brown.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-04 08:37:19 +00:00
Vadim Zeitlin
224bf05c9b added --version-full option to wx-config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-01 22:21:54 +00:00