1. configre/makefiles changes

a) wxBase compilation/installation/dist works, added wxBase.spec
 b) list of files is include by Makefile.in, not embedded into it
 c) configure runs "subconfigures" for samples/demos/utils
2. wxTokenizer class from Gregory Pietsch


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-31 18:26:16 +00:00
parent 8480b297e7
commit 2224580a41
20 changed files with 1897 additions and 3060 deletions

File diff suppressed because it is too large Load Diff

917
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -1554,9 +1554,8 @@ dnl fi
UNIXDEPS="\$(UNIX_DEPS)" UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=GTK_DIST GUIDIST=GTK_DIST
dnl test for XIM support in libgdk dnl test for XIM support in libgdk
AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
fi fi
if test "$wxUSE_WINE" = 1; then if test "$wxUSE_WINE" = 1; then
@@ -1736,16 +1735,16 @@ else
TOOLKIT_DIR="os2" TOOLKIT_DIR="os2"
fi fi
dnl the symbol which allows conditional compilation for the given toolkit dnl the symbol which allows conditional compilation for the given toolkit
TOOLKIT_DEF="-D__WX${TOOLKIT}__" TOOLKIT_DEF="-D__WX${TOOLKIT}__"
dnl the name of the (libtool) library dnl the name of the (libtool) library
WX_LIBRARY="wx_${TOOLKIT_DIR}" WX_LIBRARY="wx_${TOOLKIT_DIR}"
dnl the sources, their dependenices and the headers dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)" ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)"
if test "$wxUSE_LIBJPEG" = "yes" ; then if test "$wxUSE_LIBJPEG" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
fi fi
if test "$wxUSE_LIBTIFF" = "yes" ; then if test "$wxUSE_LIBTIFF" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
@@ -1757,19 +1756,33 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}"
ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
fi fi
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
RPM_SPEC="wx\$(TOOLKIT).spec"
dnl distribute samples/demos/utils with GUI versions
GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
DISTDIR="wx\$(TOOLKIT)"
else else
dnl leave all TOOLKIT_XXX vars empty dnl leave all TOOLKIT_XXX vars empty
USE_GUI=0 USE_GUI=0
dnl the sources, their dependenices and the headers dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(BASE_OBJS)" ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
ALL_DEPFILES="\${BASE_DEPS}" ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"
ALL_HEADERS="\${BASE_HEADERS}"
dnl building wxBase only dnl building wxBase only
WX_LIBRARY="wxbase" WX_LIBRARY="wxbase"
PORT_FILES="src/files.lst"
RPM_FILES="src/rpmfiles.lst"
RPM_SPEC="wxBase.spec"
dnl distribute only wxBase sources/headers
GUIDIST="BASE_DIST"
DISTDIR="wxBase"
fi fi
dnl the name of the (libtool) library dnl the name of the (libtool) library
@@ -2056,8 +2069,8 @@ AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf,
AC_DEFINE(HAVE_VSSCANF) AC_DEFINE(HAVE_VSSCANF)
wx_cv_func_vsscanf=yes wx_cv_func_vsscanf=yes
], ],
wx_cv_func_vsscanf=no, wx_cv_func_vsscanf=no,
wx_cv_func_vsscanf=no wx_cv_func_vsscanf=no
) )
]) ])
@@ -3272,8 +3285,13 @@ AC_SUBST(UNIXOBJS)
AC_SUBST(UNIXDEPS) AC_SUBST(UNIXDEPS)
AC_SUBST(ALL_OBJECTS) AC_SUBST(ALL_OBJECTS)
AC_SUBST(ALL_DEPFILES) AC_SUBST(ALL_DEPFILES)
AC_SUBST(ALL_HEADERS)
dnl distribution vars
AC_SUBST(GUIDIST) AC_SUBST(GUIDIST)
AC_SUBST(PORT_FILES)
AC_SUBST(DISTDIR)
AC_SUBST(RPM_SPEC)
AC_SUBST(RPM_FILES)
dnl additional subdirectories where we will build dnl additional subdirectories where we will build
AC_SUBST(SRC_SUBDIRS) AC_SUBST(SRC_SUBDIRS)
@@ -3297,15 +3315,26 @@ AC_PROG_MAKE_SET
AC_CONFIG_HEADER(setup.h:setup.h.in) AC_CONFIG_HEADER(setup.h:setup.h.in)
dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some dnl some more GUI only things
dnl genius called it "win" if test "$wxUSE_GUI" = "yes"; then
if test "${TOOLKIT_DIR}" = "msw" ; then AC_CACHE_CHECK([glcanvas subdirectory to use], wx_cv_path_glcanvas,
GL_TOOLKIT_DIR="win" [
else dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some
GL_TOOLKIT_DIR="${TOOLKIT_DIR}" dnl genius called it "win"
if test "${TOOLKIT_DIR}" = "msw" ; then
wx_cv_path_glcanvas="win"
else
wx_cv_path_glcanvas="${TOOLKIT_DIR}"
fi
])
dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack!
GL_TOOLKIT_DIR=$wx_cv_PATH_glcanvas
AC_SUBST(GL_TOOLKIT_DIR)
AC_CONFIG_SUBDIRS(demos samples utils)
fi fi
dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack! dnl from wxUSE_GUI
AC_SUBST(GL_TOOLKIT_DIR)
dnl create each of the files in the space separated list from the file.in dnl create each of the files in the space separated list from the file.in
dnl (the original file name may be overriden by appending another name after a dnl (the original file name may be overriden by appending another name after a
@@ -3316,84 +3345,6 @@ AC_OUTPUT([
src/makeprog.env src/makeprog.env
src/makelib.env src/makelib.env
Makefile Makefile
demos/Makefile
demos/bombs/Makefile
demos/dbbrowse/Makefile
demos/forty/Makefile
demos/fractal/Makefile
demos/life/Makefile
demos/poem/Makefile
samples/Makefile
samples/caret/Makefile
samples/calendar/Makefile
samples/checklst/Makefile
samples/config/Makefile
samples/controls/Makefile
samples/console/Makefile
samples/db/Makefile
samples/dialogs/Makefile
samples/docview/Makefile
samples/docvwmdi/Makefile
samples/dnd/Makefile
samples/drawing/Makefile
samples/exec/Makefile
samples/font/Makefile
samples/grid/Makefile
samples/help/Makefile
samples/image/Makefile
samples/internat/Makefile
samples/ipc/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile
samples/minifram/Makefile
samples/minimal/Makefile
samples/dialup/Makefile
samples/newgrid/Makefile
samples/notebook/Makefile
samples/png/Makefile
samples/printing/Makefile
samples/proplist/Makefile
samples/propsize/Makefile
samples/richedit/Makefile
samples/resource/Makefile
samples/sashtest/Makefile
samples/scroll/Makefile
samples/scrollsub/Makefile
samples/splitter/Makefile
samples/text/Makefile
samples/thread/Makefile
samples/toolbar/Makefile
samples/treectrl/Makefile
samples/typetest/Makefile
samples/validate/Makefile
samples/sockets/Makefile
samples/wizard/Makefile
samples/html/Makefile
samples/html/about/Makefile
samples/html/help/Makefile
samples/html/printing/Makefile
samples/html/helpview/Makefile
samples/html/test/Makefile
samples/html/zip/Makefile
samples/html/virtual/Makefile
samples/html/widget/Makefile
utils/Makefile
utils/wxMMedia2/Makefile
utils/wxMMedia2/lib/Makefile
utils/wxMMedia2/sample/Makefile
utils/glcanvas/Makefile
utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
utils/ogl/Makefile
utils/ogl/src/Makefile
utils/makegen/Makefile
utils/HelpGen/Makefile
utils/HelpGen/src/Makefile
utils/tex2rtf/Makefile
utils/tex2rtf/src/Makefile
utils/hhp2cached/Makefile
utils/dialoged/Makefile
utils/dialoged/src/Makefile
], ],
[ [
chmod +x wx-config chmod +x wx-config

View File

@@ -9,7 +9,7 @@
# #
# Makefile for bombs example (UNIX). # Makefile for bombs example (UNIX).
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@/..
top_builddir = ../.. top_builddir = ../..
program_dir = demos/bombs program_dir = demos/bombs

791
demos/configure vendored Executable file
View File

@@ -0,0 +1,791 @@
#! /bin/sh
# From configure.in Id
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
# Defaults:
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
# Initialize some variables set by options.
# The variables have the same names as the options, with
# dashes changed to underlines.
build=NONE
cache_file=./config.cache
exec_prefix=NONE
host=NONE
no_create=
nonopt=NONE
no_recursion=
prefix=NONE
program_prefix=NONE
program_suffix=NONE
program_transform_name=s,x,x,
silent=
site=
srcdir=
target=NONE
verbose=
x_includes=NONE
x_libraries=NONE
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
datadir='${prefix}/share'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
infodir='${prefix}/info'
mandir='${prefix}/man'
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
# Maximum number of lines to put in a shell here document.
ac_max_here_lines=12
ac_prev=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
eval "$ac_prev=\$ac_option"
ac_prev=
continue
fi
case "$ac_option" in
-*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) ac_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
case "$ac_option" in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
bindir="$ac_optarg" ;;
-build | --build | --buil | --bui | --bu)
ac_prev=build ;;
-build=* | --build=* | --buil=* | --bui=* | --bu=*)
build="$ac_optarg" ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ac_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
cache_file="$ac_optarg" ;;
-datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
-datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
| --da=*)
datadir="$ac_optarg" ;;
-disable-* | --disable-*)
ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
{ echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
fi
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
eval "enable_${ac_feature}=no" ;;
-enable-* | --enable-*)
ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
# Reject names that are not valid shell variable names.
if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
{ echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
fi
ac_feature=`echo $ac_feature| sed 's/-/_/g'`
case "$ac_option" in
*=*) ;;
*) ac_optarg=yes ;;
esac
eval "enable_${ac_feature}='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
| --exec | --exe | --ex)
ac_prev=exec_prefix ;;
-exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
| --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
| --exec=* | --exe=* | --ex=*)
exec_prefix="$ac_optarg" ;;
-gas | --gas | --ga | --g)
# Obsolete; use --with-gas.
with_gas=yes ;;
-help | --help | --hel | --he)
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat << EOF
Usage: configure [options] [host]
Options: [defaults in brackets after descriptions]
Configuration:
--cache-file=FILE cache test results in FILE
--help print this message
--no-create do not create output files
--quiet, --silent do not print \`checking...' messages
--version print the version of autoconf that created configure
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix]
--bindir=DIR user executables in DIR [EPREFIX/bin]
--sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
--libexecdir=DIR program executables in DIR [EPREFIX/libexec]
--datadir=DIR read-only architecture-independent data in DIR
[PREFIX/share]
--sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data in DIR
[PREFIX/com]
--localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
--libdir=DIR object code libraries in DIR [EPREFIX/lib]
--includedir=DIR C header files in DIR [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
--infodir=DIR info documentation in DIR [PREFIX/info]
--mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM
run sed PROGRAM on installed program names
EOF
cat << EOF
Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed]
--target=TARGET configure for TARGET [TARGET=HOST]
Features and packages:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
EOF
if test -n "$ac_help"; then
echo "--enable and --with options recognized:$ac_help"
fi
exit 0 ;;
-host | --host | --hos | --ho)
ac_prev=host ;;
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
| --includ=* | --inclu=* | --incl=* | --inc=*)
includedir="$ac_optarg" ;;
-infodir | --infodir | --infodi | --infod | --info | --inf)
ac_prev=infodir ;;
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
infodir="$ac_optarg" ;;
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
libdir="$ac_optarg" ;;
-libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
| --libexe | --libex | --libe)
ac_prev=libexecdir ;;
-libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
| --libexe=* | --libex=* | --libe=*)
libexecdir="$ac_optarg" ;;
-localstatedir | --localstatedir | --localstatedi | --localstated \
| --localstate | --localstat | --localsta | --localst \
| --locals | --local | --loca | --loc | --lo)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
| --localstate=* | --localstat=* | --localsta=* | --localst=* \
| --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
localstatedir="$ac_optarg" ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
ac_prev=mandir ;;
-mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
mandir="$ac_optarg" ;;
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
-no-create | --no-create | --no-creat | --no-crea | --no-cre \
| --no-cr | --no-c)
no_create=yes ;;
-no-recursion | --no-recursion | --no-recursio | --no-recursi \
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
no_recursion=yes ;;
-oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
| --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
| --oldin | --oldi | --old | --ol | --o)
ac_prev=oldincludedir ;;
-oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
| --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
| --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
oldincludedir="$ac_optarg" ;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
prefix="$ac_optarg" ;;
-program-prefix | --program-prefix | --program-prefi | --program-pref \
| --program-pre | --program-pr | --program-p)
ac_prev=program_prefix ;;
-program-prefix=* | --program-prefix=* | --program-prefi=* \
| --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
program_prefix="$ac_optarg" ;;
-program-suffix | --program-suffix | --program-suffi | --program-suff \
| --program-suf | --program-su | --program-s)
ac_prev=program_suffix ;;
-program-suffix=* | --program-suffix=* | --program-suffi=* \
| --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
program_suffix="$ac_optarg" ;;
-program-transform-name | --program-transform-name \
| --program-transform-nam | --program-transform-na \
| --program-transform-n | --program-transform- \
| --program-transform | --program-transfor \
| --program-transfo | --program-transf \
| --program-trans | --program-tran \
| --progr-tra | --program-tr | --program-t)
ac_prev=program_transform_name ;;
-program-transform-name=* | --program-transform-name=* \
| --program-transform-nam=* | --program-transform-na=* \
| --program-transform-n=* | --program-transform-=* \
| --program-transform=* | --program-transfor=* \
| --program-transfo=* | --program-transf=* \
| --program-trans=* | --program-tran=* \
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name="$ac_optarg" ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
| --sbi=* | --sb=*)
sbindir="$ac_optarg" ;;
-sharedstatedir | --sharedstatedir | --sharedstatedi \
| --sharedstated | --sharedstate | --sharedstat | --sharedsta \
| --sharedst | --shareds | --shared | --share | --shar \
| --sha | --sh)
ac_prev=sharedstatedir ;;
-sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
| --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
| --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
| --sha=* | --sh=*)
sharedstatedir="$ac_optarg" ;;
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
site="$ac_optarg" ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
srcdir="$ac_optarg" ;;
-sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
| --syscon | --sysco | --sysc | --sys | --sy)
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
sysconfdir="$ac_optarg" ;;
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
target="$ac_optarg" ;;
-v | -verbose | --verbose | --verbos | --verbo | --verb)
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.13"
exit 0 ;;
-with-* | --with-*)
ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
# Reject names that are not valid shell variable names.
if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
{ echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
fi
ac_package=`echo $ac_package| sed 's/-/_/g'`
case "$ac_option" in
*=*) ;;
*) ac_optarg=yes ;;
esac
eval "with_${ac_package}='$ac_optarg'" ;;
-without-* | --without-*)
ac_package=`echo $ac_option|sed -e 's/-*without-//'`
# Reject names that are not valid shell variable names.
if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
{ echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
fi
ac_package=`echo $ac_package| sed 's/-/_/g'`
eval "with_${ac_package}=no" ;;
--x)
# Obsolete; use --with-x.
with_x=yes ;;
-x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
| --x-incl | --x-inc | --x-in | --x-i)
ac_prev=x_includes ;;
-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
x_includes="$ac_optarg" ;;
-x-libraries | --x-libraries | --x-librarie | --x-librari \
| --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
ac_prev=x_libraries ;;
-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries="$ac_optarg" ;;
-*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
*)
if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
echo "configure: warning: $ac_option: invalid host type" 1>&2
fi
if test "x$nonopt" != xNONE; then
{ echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
fi
nonopt="$ac_option"
;;
esac
done
if test -n "$ac_prev"; then
{ echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
fi
trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
# File descriptor usage:
# 0 standard input
# 1 file creation
# 2 errors and warnings
# 3 some systems may open it to /dev/tty
# 4 used on the Kubota Titan
# 6 checking for... messages and results
# 5 compiler messages saved in config.log
if test "$silent" = yes; then
exec 6>/dev/null
else
exec 6>&1
fi
exec 5>./config.log
echo "\
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
" 1>&5
# Strip out --no-create and --no-recursion so they do not pile up.
# Also quote any args containing shell metacharacters.
ac_configure_args=
for ac_arg
do
case "$ac_arg" in
-no-create | --no-create | --no-creat | --no-crea | --no-cre \
| --no-cr | --no-c) ;;
-no-recursion | --no-recursion | --no-recursio | --no-recursi \
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
ac_configure_args="$ac_configure_args '$ac_arg'" ;;
*) ac_configure_args="$ac_configure_args $ac_arg" ;;
esac
done
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
# Non-C LC_CTYPE values break the ctype check.
if test "${LANG+set}" = set; then LANG=C; export LANG; fi
if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
# AIX cpp loses on an empty file, so make sure it contains at least a newline.
echo > confdefs.h
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=Makefile.in
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then its parent.
ac_prog=$0
ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
srcdir=$ac_confdir
if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
{ echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
else
{ echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
fi
fi
srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
else
CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
echo "loading site script $ac_site_file"
. "$ac_site_file"
fi
done
if test -r "$cache_file"; then
echo "loading cache $cache_file"
. $cache_file
else
echo "creating cache $cache_file"
> $cache_file
fi
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
ac_exeext=
ac_objext=o
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
ac_n= ac_c='
' ac_t=' '
else
ac_n=-n ac_c= ac_t=
fi
else
ac_n= ac_c='\c' ac_t=
fi
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
# scripts and configure runs. It is not useful on other systems.
# If it contains results you don't want to keep, you may remove or edit it.
#
# By default, configure uses ./config.cache as the cache file,
# creating it if it does not exist already. You can give configure
# the --cache-file=FILE option to use a different cache file; that is
# what configure does when it calls configure scripts in
# subdirectories, so they share the cache.
# Giving --cache-file=/dev/null disables caching, for debugging configure.
# config.status only pays attention to the cache file if you give it the
# --recheck option to rerun configure.
#
EOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
# So, don't put newlines in cache variables' values.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
case `(ac_space=' '; set | grep ac_space) 2>&1` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
# turns \\\\ into \\, and sed turns \\ into \).
sed -n \
-e "s/'/'\\\\''/g" \
-e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
;;
esac >> confcache
if cmp -s $cache_file confcache; then
:
else
if test -w $cache_file; then
echo "updating cache $cache_file"
cat confcache > $cache_file
else
echo "not updating unwritable cache $cache_file"
fi
fi
rm -f confcache
trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# Any assignment to VPATH causes Sun make to only execute
# the first set of double-colon rules, so remove it if not needed.
# If there is a colon in the path, we need to keep it.
if test "x$srcdir" = x.; then
ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
fi
trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
cat > conftest.defs <<\EOF
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
s%\$%$$%g
EOF
DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
rm -f conftest.defs
# Without the "./", some shells look in PATH for config.status.
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
rm -f $CONFIG_STATUS
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
# Run this file to recreate the current configuration.
# This directory was configured as follows,
# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
#
# $0 $ac_configure_args
#
# Compiler output produced by configure, useful for debugging
# configure, is in ./config.log if it exists.
ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
for ac_option
do
case "\$ac_option" in
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
echo "$CONFIG_STATUS generated by autoconf version 2.13"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
*) echo "\$ac_cs_usage"; exit 1 ;;
esac
done
ac_given_srcdir=$srcdir
trap 'rm -fr `echo "
Makefile
bombs/Makefile
dbbrowse/Makefile
forty/Makefile
fractal/Makefile
life/Makefile
poem/Makefile
" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
# Protect against being on the right side of a sed subst in config.status.
sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
s%@SHELL@%$SHELL%g
s%@CFLAGS@%$CFLAGS%g
s%@CPPFLAGS@%$CPPFLAGS%g
s%@CXXFLAGS@%$CXXFLAGS%g
s%@FFLAGS@%$FFLAGS%g
s%@DEFS@%$DEFS%g
s%@LDFLAGS@%$LDFLAGS%g
s%@LIBS@%$LIBS%g
s%@exec_prefix@%$exec_prefix%g
s%@prefix@%$prefix%g
s%@program_transform_name@%$program_transform_name%g
s%@bindir@%$bindir%g
s%@sbindir@%$sbindir%g
s%@libexecdir@%$libexecdir%g
s%@datadir@%$datadir%g
s%@sysconfdir@%$sysconfdir%g
s%@sharedstatedir@%$sharedstatedir%g
s%@localstatedir@%$localstatedir%g
s%@libdir@%$libdir%g
s%@includedir@%$includedir%g
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
s%@mandir@%$mandir%g
CEOF
EOF
cat >> $CONFIG_STATUS <<\EOF
# Split the substitutions into bite-sized pieces for seds with
# small command number limits, like on Digital OSF/1 and HP-UX.
ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
ac_file=1 # Number of current file.
ac_beg=1 # First line for current file.
ac_end=$ac_max_sed_cmds # Line after last line for current file.
ac_more_lines=:
ac_sed_cmds=""
while $ac_more_lines; do
if test $ac_beg -gt 1; then
sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
else
sed "${ac_end}q" conftest.subs > conftest.s$ac_file
fi
if test ! -s conftest.s$ac_file; then
ac_more_lines=false
rm -f conftest.s$ac_file
else
if test -z "$ac_sed_cmds"; then
ac_sed_cmds="sed -f conftest.s$ac_file"
else
ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
fi
ac_file=`expr $ac_file + 1`
ac_beg=$ac_end
ac_end=`expr $ac_end + $ac_max_sed_cmds`
fi
done
if test -z "$ac_sed_cmds"; then
ac_sed_cmds=cat
fi
EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile
bombs/Makefile
dbbrowse/Makefile
forty/Makefile
fractal/Makefile
life/Makefile
poem/Makefile
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case "$ac_file" in
*:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
# Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
# The file is in a subdirectory.
test ! -d "$ac_dir" && mkdir "$ac_dir"
ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
# A "../" for each directory in $ac_dir_suffix.
ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
else
ac_dir_suffix= ac_dots=
fi
case "$ac_given_srcdir" in
.) srcdir=.
if test -z "$ac_dots"; then top_srcdir=.
else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
/*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
echo creating "$ac_file"
rm -f "$ac_file"
configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
case "$ac_file" in
*Makefile*) ac_comsub="1i\\
# $configure_input" ;;
*) ac_comsub= ;;
esac
ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
sed -e "$ac_comsub
s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
s%@top_srcdir@%$top_srcdir%g
" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
fi; done
rm -f conftest.s*
EOF
cat >> $CONFIG_STATUS <<EOF
EOF
cat >> $CONFIG_STATUS <<\EOF
exit 0
EOF
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1

14
demos/configure.in Normal file
View File

@@ -0,0 +1,14 @@
dnl Process this file with autoconf to produce a configure script.
AC_REVISION($Id$)dnl
AC_INIT(Makefile.in)
AC_OUTPUT([
Makefile
bombs/Makefile
dbbrowse/Makefile
forty/Makefile
fractal/Makefile
life/Makefile
poem/Makefile
])

View File

@@ -9,7 +9,7 @@
# #
# Makefile for dbbrowse example (UNIX). # Makefile for dbbrowse example (UNIX).
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@/..
top_builddir = ../.. top_builddir = ../..
program_dir = demos/dbbrowse program_dir = demos/dbbrowse

View File

@@ -8,6 +8,11 @@
// Licence: wxWindows license // Licence: wxWindows license
// RCS-ID: $Id$ // RCS-ID: $Id$
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
#error "DBGrid requires the new wxGrid class"
#endif
class mjDoc; class mjDoc;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class DBGrid: public wxGrid class DBGrid: public wxGrid

View File

@@ -9,7 +9,7 @@
# #
# Makefile for forty example (UNIX). # Makefile for forty example (UNIX).
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@/..
top_builddir = ../.. top_builddir = ../..
program_dir = demos/forty program_dir = demos/forty

View File

@@ -9,7 +9,7 @@
# #
# Makefile for fractal example (UNIX). # Makefile for fractal example (UNIX).
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@/..
top_builddir = ../.. top_builddir = ../..
program_dir = demos/fractal program_dir = demos/fractal

View File

@@ -9,7 +9,7 @@
# #
# Makefile for toolbar example (UNIX). # Makefile for toolbar example (UNIX).
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@/..
top_builddir = ../.. top_builddir = ../..
program_dir = demos/life program_dir = demos/life

View File

@@ -9,7 +9,7 @@
# #
# Makefile for wxPoem example (UNIX). # Makefile for wxPoem example (UNIX).
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@/..
top_builddir = ../.. top_builddir = ../..
program_dir = demos/poem program_dir = demos/poem

84
distrib/msw/tmake/base.t Normal file
View File

@@ -0,0 +1,84 @@
#!################################################################################
#! File: base.t
#! Purpose: tmake template file from which src/common/files.lst containing the
#! list of files for wxBase library is generated by tmake
#! Author: Vadim Zeitlin
#! Created: 27.01.00
#! Version: $Id$
#!################################################################################
#${
#! include the code which parses filelist.txt file and initializes
#! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and
#! %wxOS2PM hashes.
IncludeTemplate("filelist.t");
#! find all our sources
foreach $file (sort keys %wxBase) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"BASE_SOURCES"} .= "common/" . $file . " ";
$project{"BASE_OBJS"} .= $fileobj . " ";
$project{"BASE_DEPS"} .= $filedep . " ";
}
foreach $file (sort keys %wxCommon) {
next unless $wxCommon{$file} =~ /\bB\b/;
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"BASE_SOURCES"} .= "common/" . $file . " ";
$project{"BASE_OBJS"} .= $fileobj . " ";
$project{"BASE_DEPS"} .= $filedep . " ";
}
foreach $file (sort keys %wxUNIX) {
next unless $wxUNIX{$file} =~ /\bB\b/;
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"BASE_SOURCES"} .= "unix/" . $file . " ";
$project{"BASE_UNIX_OBJS"} .= $fileobj . " ";
$project{"BASE_UNIX_DEPS"} .= $filedep . " ";
}
#! find all our headers
foreach $file (sort keys %wxWXINCLUDE) {
next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= $file . " "
}
foreach $file (sort keys %wxUNIXINCLUDE) {
next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= "unix/" . $file . " "
}
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= "protocol/" . $file . " "
}
#$}
# This file was automatically generated by tmake at #$ Now()
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
ALL_SOURCES = \
#$ ExpandList("BASE_SOURCES");
ALL_HEADERS = \
#$ ExpandList("BASE_HEADERS");
BASE_OBJS = \
#$ ExpandList("BASE_OBJS");
BASE_DEPS = \
#$ ExpandList("BASE_DEPS");
BASE_UNIX_OBJS = \
#$ ExpandList("BASE_UNIX_OBJS");
BASE_DEPS = \
#$ ExpandList("BASE_DEPS");

View File

@@ -0,0 +1,30 @@
#!################################################################################
#! File: base.t
#! Purpose: tmake template file from which src/rpmfiles.lst containing the
#! list of files for wxBase.spec RPM generation script is generated
#! Author: Vadim Zeitlin
#! Created: 28.01.00
#! Version: $Id$
#!################################################################################
#${
IncludeTemplate("filelist.t");
foreach $file (sort keys %wxWXINCLUDE) {
next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= "include/wx/" . $file . " "
}
foreach $file (sort keys %wxUNIXINCLUDE) {
next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= "include/wx/unix/" . $file . " "
}
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/;
$project{"BASE_HEADERS"} .= "include/wx/protocol/" . $file . " "
}
#$}
#$ ExpandGlue("BASE_HEADERS", "/usr/", "\n/usr/", "");

View File

@@ -109,7 +109,7 @@ config.cpp C B
ctrlcmn.cpp C ctrlcmn.cpp C
ctrlsub.cpp C ctrlsub.cpp C
datetime.cpp C B datetime.cpp C B
datstrm.cpp C datstrm.cpp C B
db.cpp C db.cpp C
dbtable.cpp C dbtable.cpp C
dcbase.cpp C dcbase.cpp C
@@ -163,7 +163,7 @@ mimecmn.cpp C 32,B
module.cpp C B module.cpp C B
mstream.cpp C mstream.cpp C
object.cpp C B object.cpp C B
objstrm.cpp C objstrm.cpp C B
odbc.cpp C R,X odbc.cpp C R,X
paper.cpp C paper.cpp C
prntbase.cpp C prntbase.cpp C
@@ -174,7 +174,7 @@ sckaddr.cpp C S
sckfile.cpp C S sckfile.cpp C S
sckipc.cpp C S sckipc.cpp C S
sckstrm.cpp C S sckstrm.cpp C S
serbase.cpp C serbase.cpp C B
sizer.cpp C sizer.cpp C
socket.cpp C S socket.cpp C S
stream.cpp C B stream.cpp C B
@@ -525,8 +525,8 @@ m_tables.cpp H
m_meta.cpp H m_meta.cpp H
htmprint.cpp H htmprint.cpp H
arrimpl.cpp W arrimpl.cpp W B
listimpl.cpp W listimpl.cpp W B
accel.h W accel.h W
app.h W B app.h W B
bitmap.h W bitmap.h W
@@ -547,8 +547,8 @@ cmndata.h W
colordlg.h W colordlg.h W
colour.h W colour.h W
combobox.h W combobox.h W
confbase.h W confbase.h W B
config.h W config.h W B
control.h W control.h W
ctrlsub.h W ctrlsub.h W
cursor.h W cursor.h W
@@ -556,7 +556,7 @@ dataobj.h W
date.h W B date.h W B
datetime.h W B datetime.h W B
datetime.inl W B datetime.inl W B
datstrm.h W datstrm.h W B
db.h W db.h W
dbtable.h W dbtable.h W
dc.h W dc.h W
@@ -585,8 +585,8 @@ ffile.h W B
file.h W B file.h W B
fileconf.h W B fileconf.h W B
filedlg.h W filedlg.h W
filefn.h W filefn.h W B
filesys.h W filesys.h W B
font.h W font.h W
fontdlg.h W fontdlg.h W
fontenum.h W fontenum.h W
@@ -646,7 +646,7 @@ msgdlg.h W
mstream.h W mstream.h W
notebook.h W notebook.h W
object.h W B object.h W B
objstrm.h W objstrm.h W B
odbc.h W odbc.h W
ownerdrw.h W ownerdrw.h W
palette.h W palette.h W
@@ -672,7 +672,7 @@ sckipc.h W
sckstrm.h W sckstrm.h W
scrolbar.h W scrolbar.h W
scrolwin.h W scrolwin.h W
serbase.h W serbase.h W B
settings.h W settings.h W
setup.h W setup.h W
sizer.h W sizer.h W
@@ -707,7 +707,7 @@ toolbar.h W
tooltip.h W tooltip.h W
treectrl.h W treectrl.h W
types.h W types.h W
url.h W url.h W B
utils.h W B utils.h W B
valgen.h W valgen.h W
validate.h W validate.h W
@@ -1043,10 +1043,10 @@ execute.h S
mimetype.h S B mimetype.h S B
gsockunx.h S gsockunx.h S
file.h P file.h P B
ftp.h P ftp.h P B
http.h P http.h P B
protocol.h P protocol.h P B
forcelnk.h L forcelnk.h L
helpdata.h L helpdata.h L

134
distrib/msw/tmake/gtk.t Normal file
View File

@@ -0,0 +1,134 @@
#!################################################################################
#! File: gtk.t
#! Purpose: tmake template file from which src/gtk/files.lst containing the
#! list of files for wxGTK library is generated by tmake
#! Author: Vadim Zeitlin
#! Created: 28.01.00
#! Version: $Id$
#!################################################################################
#${
#! include the code which parses filelist.txt file and initializes
#! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxGTK, %wxMOTIF and
#! %wxOS2PM hashes.
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
$project{"COMMONDEPS"} .= "parser.d ";
foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\bR\b/;
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"GTK_SOURCES"} .= "generic/" . $file . " ";
$project{"GENERICOBJS"} .= $fileobj . " ";
$project{"GENERICDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxCommon) {
next if $wxCommon{$file} =~ /\bR\b/;
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"GTK_SOURCES"} .= "common/" . $file . " ";
$project{"COMMONOBJS"} .= $fileobj . " ";
$project{"COMMONDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxGTK) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
$project{"GUIOBJS"} .= $fileobj . " ";
$project{"GUIDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxUNIX) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"GTK_SOURCES"} .= "unix/" . $file . " ";
$project{"UNIXOBJS"} .= $fileobj . " ";
$project{"UNIXDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxHTML) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"GTK_SOURCES"} .= "html/" . $file . " ";
$project{"HTMLOBJS"} .= $fileobj . " ";
$project{"HTMLDEPS"} .= $filedep . " "
}
#! find all our headers
foreach $file (sort keys %wxWXINCLUDE) {
$project{"GTK_HEADERS"} .= $file . " "
}
foreach $file (sort keys %wxGTKINCLUDE) {
$project{"GTK_HEADERS"} .= "gtk/" . $file . " "
}
foreach $file (sort keys %wxGENERICINCLUDE) {
$project{"GTK_HEADERS"} .= "generic/" . $file . " "
}
foreach $file (sort keys %wxUNIXINCLUDE) {
$project{"GTK_HEADERS"} .= "unix/" . $file . " "
}
foreach $file (sort keys %wxHTMLINCLUDE) {
$project{"GTK_HEADERS"} .= "html/" . $file . " "
}
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
$project{"GTK_HEADERS"} .= "protocol/" . $file . " "
}
#$}
# This file was automatically generated by tmake at #$ Now()
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \
#$ ExpandList("GTK_SOURCES");
ALL_HEADERS = \
#$ ExpandList("GTK_HEADERS");
COMMONOBJS = \
#$ ExpandList("COMMONOBJS");
COMMONDEPS = \
#$ ExpandList("COMMONDEPS");
GENERICOBJS = \
#$ ExpandList("GENERICOBJS");
GENERICDEPS = \
#$ ExpandList("GENERICDEPS");
GUIOBJS = \
#$ ExpandList("GUIOBJS");
GUIDEPS = \
#$ ExpandList("GUIDEPS");
UNIXOBJS = \
#$ ExpandList("UNIXOBJS");
UNIXDEPS = \
#$ ExpandList("UNIXDEPS");
HTMLOBJS = \
#$ ExpandList("HTMLOBJS");
HTMLDEPS = \
#$ ExpandList("HTMLDEPS");
IODBCOBJS = \
#$ ExpandList("IODBCOBJS");
IODBCDEPS = \
#$ ExpandList("IODBCDEPS");

135
distrib/msw/tmake/motif.t Normal file
View File

@@ -0,0 +1,135 @@
#!################################################################################
#! File: motif.t
#! Purpose: tmake template file from which src/motif/files.lst containing the
#! list of files for wxMotif library is generated by tmake
#! Author: Vadim Zeitlin
#! Created: 28.01.00
#! Version: $Id$
#!################################################################################
#${
#! include the code which parses filelist.txt file and initializes
#! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxMOTIF, %wxMOTIF and
#! %wxOS2PM hashes.
IncludeTemplate("filelist.t");
#! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
$project{"COMMONDEPS"} .= "parser.d ";
$project{"GUIOBJS"} .= "xmcombo.o ";
foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\bX\b/;
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"MOTIF_SOURCES"} .= "generic/" . $file . " ";
$project{"GENERICOBJS"} .= $fileobj . " ";
$project{"GENERICDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxCommon) {
next if $wxCommon{$file} =~ /\bR\b/;
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"MOTIF_SOURCES"} .= "common/" . $file . " ";
$project{"COMMONOBJS"} .= $fileobj . " ";
$project{"COMMONDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxMOTIF) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"MOTIF_SOURCES"} .= "motif/" . $file . " ";
$project{"GUIOBJS"} .= $fileobj . " ";
$project{"GUIDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxUNIX) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"MOTIF_SOURCES"} .= "unix/" . $file . " ";
$project{"UNIXOBJS"} .= $fileobj . " ";
$project{"UNIXDEPS"} .= $filedep . " "
}
foreach $file (sort keys %wxHTML) {
($fileobj = $file) =~ s/cp?p?$/\o/;
($filedep = $file) =~ s/cp?p?$/\d/;
$project{"MOTIF_SOURCES"} .= "html/" . $file . " ";
$project{"HTMLOBJS"} .= $fileobj . " ";
$project{"HTMLDEPS"} .= $filedep . " "
}
#! find all our headers
foreach $file (sort keys %wxWXINCLUDE) {
$project{"MOTIF_HEADERS"} .= $file . " "
}
foreach $file (sort keys %wxMOTIFINCLUDE) {
$project{"MOTIF_HEADERS"} .= "motif/" . $file . " "
}
foreach $file (sort keys %wxGENERICINCLUDE) {
$project{"MOTIF_HEADERS"} .= "generic/" . $file . " "
}
foreach $file (sort keys %wxUNIXINCLUDE) {
$project{"MOTIF_HEADERS"} .= "unix/" . $file . " "
}
foreach $file (sort keys %wxHTMLINCLUDE) {
$project{"MOTIF_HEADERS"} .= "html/" . $file . " "
}
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
$project{"MOTIF_HEADERS"} .= "protocol/" . $file . " "
}
#$}
# This file was automatically generated by tmake at #$ Now()
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
ALL_SOURCES = \
#$ ExpandList("MOTIF_SOURCES");
ALL_HEADERS = \
#$ ExpandList("MOTIF_HEADERS");
COMMONOBJS = \
#$ ExpandList("COMMONOBJS");
COMMONDEPS = \
#$ ExpandList("COMMONDEPS");
GENERICOBJS = \
#$ ExpandList("GENERICOBJS");
GENERICDEPS = \
#$ ExpandList("GENERICDEPS");
GUIOBJS = \
#$ ExpandList("GUIOBJS");
GUIDEPS = \
#$ ExpandList("GUIDEPS");
UNIXOBJS = \
#$ ExpandList("UNIXOBJS");
UNIXDEPS = \
#$ ExpandList("UNIXDEPS");
HTMLOBJS = \
#$ ExpandList("HTMLOBJS");
HTMLDEPS = \
#$ ExpandList("HTMLDEPS");
IODBCOBJS = \
#$ ExpandList("IODBCOBJS");
IODBCDEPS = \
#$ ExpandList("IODBCDEPS");

14
docs/install.txt Normal file
View File

@@ -0,0 +1,14 @@
INSTALL.TXT
NB: this file describes the installation of wxBase library. If you are using a
GUI version of wxWindows, please refer to the install.txt in the
appropriate subdirectory!
0. Requirments and supported platforms
-----------------------------------
1. Installing under Win32
----------------------
2. Installing under Unix/BeOS
--------------------------

View File

@@ -2,7 +2,7 @@
// Name: tokenzr.h // Name: tokenzr.h
// Purpose: String tokenizer // Purpose: String tokenizer
// Author: Guilhem Lavaux // Author: Guilhem Lavaux
// Modified by: // Modified by: Gregory Pietsch
// Created: 04/22/98 // Created: 04/22/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux // Copyright: (c) Guilhem Lavaux
@@ -13,7 +13,7 @@
#define _WX_TOKENZRH #define _WX_TOKENZRH
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface "tokenzr.h"
#endif #endif
#include "wx/object.h" #include "wx/object.h"
@@ -26,7 +26,7 @@ public:
wxStringTokenizer(const wxString& to_tokenize, wxStringTokenizer(const wxString& to_tokenize,
const wxString& delims = " \t\r\n", const wxString& delims = " \t\r\n",
bool ret_delim = FALSE); bool ret_delim = FALSE);
wxStringTokenizer() { m_retdelims = FALSE;} wxStringTokenizer() { m_retdelims = FALSE; m_pos = 0; }
virtual ~wxStringTokenizer(); virtual ~wxStringTokenizer();
int CountTokens() const; int CountTokens() const;
@@ -36,6 +36,9 @@ public:
wxString GetNextToken() { return NextToken(); }; wxString GetNextToken() { return NextToken(); };
wxString GetString() const { return m_string; } wxString GetString() const { return m_string; }
// One note about GetString -- it returns the string
// remaining after the previous tokens have been removed,
// not the original string
void SetString(const wxString& to_tokenize, void SetString(const wxString& to_tokenize,
const wxString& delims = " \t\r\n", const wxString& delims = " \t\r\n",
@@ -44,14 +47,18 @@ public:
m_string = to_tokenize; m_string = to_tokenize;
m_delims = delims; m_delims = delims;
m_retdelims = ret_delim; m_retdelims = ret_delim;
m_pos = 0;
} }
protected: // Here's the desired function. It returns the position
off_t FindDelims(const wxString& str, const wxString& delims) const; // of the next token in the original string by keeping track
void EatLeadingDelims(); // of everything that's been deleted by GetNextToken.
wxUint32 GetPosition() { return m_pos; }
protected:
wxString m_string, m_delims; wxString m_string, m_delims;
bool m_retdelims; bool m_retdelims;
wxUint32 m_pos; // the position
}; };
#endif // _WX_TOKENZRH #endif // _WX_TOKENZRH

71
wxBase.spec Normal file
View File

@@ -0,0 +1,71 @@
# Note that this is NOT a relocatable package
%define pref /usr
%define ver 2.1.13
%define rel 0
Summary: wxBase library - non-GUI support classes of wxWindows toolkit
Name: wxBase
Version: %{ver}
Release: %{rel}
Copyright: wxWindows Licence
Group: Development/Libraries
Source: wxBase-%{ver}.tar.gz
URL: none
Packager: Vadim Zeitlin <vadim@wxwindows.org>
BuildRoot: /tmp/wxBase_rpm
%description
wxBase is a collection of C++ classes providing basic data structures (strings,
lists, arrays), powerful wxDateTime class for date manipulations, portable
wrappers around many OS-specific functions allowing to build the same program
under all supported folders, wxThread class for writing multithreaded programs
using either Win32 or POSIX threads and much more. wxBase currently supports
the following platforms: Win32, generic Unix (Linux, FreeBSD, Solaris, HP-UX,
...) and BeOS.
%package devel
Summary: wxBase headers needed for developping with wxBase
Group: Development/Libraries
Requires: wxBase
%description devel
Header files for wxBase. You need them to develop programs using wxBase.
%prep
%setup -n wxBase
./configure --prefix=%{pref} --disable-gui
%build
if [ "$SMP" != "" ]; then
export MAKE="make -j$SMP"
else
export MAKE="make"
fi
$MAKE
%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{pref} install
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%files
%defattr (644, root, root, 755)
%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
%attr(755, -, -) %{pref}/lib/libwxbase*
%dir %{pref}/lib/wx
%dir %{pref}/lib/wx/include
%dir %{pref}/lib/wx/include/wx
%{pref}/lib/wx/include/wx/setup.h
%files devel -f src/rpmfiles.lst
%defattr (644, root, root, 755)
%attr(755, -, -) %{pref}/bin/wx-config