Commit Graph

862 Commits

Author SHA1 Message Date
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
fdec35499d Add xrc to the dist target.
Bump subrelease to 2.5.2.9.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-21 21:54:57 +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
9a8f051375 moving XRC to the core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-20 19:30:20 +00:00
Włodzimierz Skiba
92bbdbcdb8 wxChoicebook generic implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 15:13:52 +00:00
Vadim Zeitlin
4d4ff94c65 output "GTK+ 2" toolkit for gtk2 builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-14 15:33:07 +00:00
Stefan Neis
6944b203c4 Untabified (TABs seem to cause strange problems with autoconf-2.59, at least
on OS/2.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-29 20:09:09 +00:00
Václav Slavík
44309ea126 autoconf >= 2.58 is needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-21 17:27:16 +00:00
Stefan Neis
97e54bdb9b Check for socklen_t type using C++ mode (since gsocket.cpp is now C++ code).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-21 17:15:04 +00:00
Václav Slavík
a0f9686df5 removed code already present in AC_BAKEFILE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-19 13:33:27 +00:00
Václav Slavík
4b167aca0c moved wx-config to wx-config-VERSION (with symlink), to satisfy Debian packagers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-11 20:37:33 +00:00
Václav Slavík
0c3c69fc1e HP-UX fix: removed unneeded call to sed(patch #1005025)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-08 14:51:49 +00:00
Stefan Neis
858e1e7c8d Fixed typo reported in patch 1004953.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-07 13:25:03 +00:00
Václav Slavík
2057db16c0 added splash sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-05 13:51:43 +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
Václav Slavík
b3de4970ca fixed symlinks creation on platforms where ln -s is cp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 19:24:53 +00:00
Václav Slavík
166bcebb8e install headers in prefix/include/wx-version/wx/ instead of prefix/include/wx/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 08:28:28 +00:00
Václav Slavík
a87bf37838 wx-config symlink creation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 07:43:05 +00:00
Václav Slavík
07bea8f0a0 detect WebKit availability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 07:37:44 +00:00
Robin Dunn
e586e41df3 Add -framework QuickTime if --enable-sound
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-22 00:44:39 +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
Vadim Zeitlin
2ad50b4fb3 add except to the samples being built; verify that --enable-exceptions and --enable-no_exceptions are not used simultaneously
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 10:05:56 +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
9f45f08eff made GTK+2 the default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 16:39:28 +00:00
Václav Slavík
74b8433210 put -DNO_GCC_PRAGMA into CPPFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-29 20:36:13 +00:00
Vadim Zeitlin
0acc5a4075 don't duplicate code checking for X for X11 and Motif ports; filter out -RNONE from the X_LIBS set by AC_PATH_XTRA (see patch 956017)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-28 10:38:51 +00:00
David Elliott
723e9bc9d9 wxCocoa: don't force DEFAULT_wxUSE_SCROLLBAR=no
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-23 16:01:19 +00:00
David Elliott
4842cc59b5 wxCocoa no longer uses the generic notebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-22 21:24:44 +00:00
Václav Slavík
fbe47c7b5c check for wputc wputchar putws fputws availability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-20 17:18:50 +00:00
Václav Slavík
646b6ec1a8 GTK2 port is not experimental anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-19 14:03:42 +00:00
Julian Smart
ec9f9256ea Added --enable-webkit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-17 19:42:56 +00:00
Václav Slavík
304205f142 use pango_font_family_is_monospace() to enumerate fixed-width fonts if available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-06 15:32:07 +00:00
Václav Slavík
1f344abfcc new MinGW requires NO_GCC_PRAGMA for exceptions handling, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-05 21:47:43 +00:00
David Elliott
2a5d7a98a8 Do not check for Xinerama when building wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-02 18:11:32 +00:00
Václav Slavík
ac1cb8d36b fixed --disable-rpath handling (patch 956695)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-29 12:48:05 +00:00
Robin Dunn
de59c1618f Updated version variables in configure.in to go along with the changes
in version.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-24 19:27:25 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Kevin Ollivier
7866e9c949 Updating configure.in to work with wxWebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-22 19:54:20 +00:00
Stefan Neis
0ed330b47a For OS/2 PM builds, check for type SPBCDATA in system headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-16 13:12:58 +00:00
Stefan Neis
337a3714b6 Work-around for compilation problems on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-16 12:12:48 +00:00
Mattia Barbon
bdcade0a10 When wxUSE_STL == 1 and STL provides quasi-standard hash_map/hash_set,
wxHashMap/wxHashSet are just typedefs for them. This makes impossible
to forward declare these classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-08 20:20:24 +00:00
Stefan Neis
24ec43dbdb OS/2 PM does not yet support toggle button.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-08 09:24:04 +00:00
Vadim Zeitlin
efd17a1d4f split wxUSE_MDI from wxUSE_MDI_ARCHITECTURE (which is wxUSE_MDI + wxUSE_DOCVIEW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-07 22:17:29 +00:00
Václav Slavík
c2218763d5 corrected cppunit test's output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-02 09:01:16 +00:00
Mattia Barbon
bea8e651c7 Fixed MinGW compilation with GCC 3.x when wxUSE_STL == 1.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-02 08:11:52 +00:00
Václav Slavík
477a623837 removed wxGzipStreams (supported by wxZlibStreams now)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-25 08:55:57 +00:00
Václav Slavík
dcc1b6ad4c quoting fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-16 21:19:04 +00:00
Roger Gammans
01cb68df7c Add configure test for presence/compilabilty of multimon.h and display.h
header whcih are required for dsrc/msw/display.cpp - but aren't included
in mingw.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-16 20:27:43 +00:00
Václav Slavík
473276a9a5 upgrade to bakefile-0.1.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-06 09:49:48 +00:00
Vadim Zeitlin
aa10ccc2e2 use -lcma for a build with threads under HP-UX using native compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-30 14:38:10 +00:00