Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. configure caches the command line options

Browse Source 
2. Motif makefile added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-07 18:27:43 +00:00
parent 34636400a0
commit 143121c5e1
5 changed files with 505 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
aclocal.m4 vendored
View File

@@ -755,10 +755,10 @@ dnl macros to find the a file in the list of include/lib paths
dnl =========================================================================== dnl ===========================================================================
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl call AC_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes
dnl to the full name of the file that was found or leaves it empty if not found dnl to the full name of the file that was found or leaves it empty if not found
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_PATH_FIND_INCLUDES, AC_DEFUN(WX_PATH_FIND_INCLUDES,
[ [
ac_find_includes= ac_find_includes=
for ac_dir in $1; for ac_dir in $1;
@@ -771,10 +771,10 @@ for ac_dir in $1;
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl call AC_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_includes dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_includes
dnl to the full name of the file that was found or leaves it empty if not found dnl to the full name of the file that was found or leaves it empty if not found
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_PATH_FIND_LIBRARIES, AC_DEFUN(WX_PATH_FIND_LIBRARIES,
[ [
ac_find_libraries= ac_find_libraries=
for ac_dir in $1; for ac_dir in $1;
@@ -791,7 +791,7 @@ for ac_dir in $1;
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Path to include, already defined dnl Path to include, already defined
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_INCLUDE_PATH_EXIST, AC_DEFUN(WX_INCLUDE_PATH_EXIST,
[ [
ac_path_to_include=$1 ac_path_to_include=$1
echo "$2" | grep "\-I$1" > /dev/null echo "$2" | grep "\-I$1" > /dev/null
@@ -806,7 +806,7 @@ AC_DEFUN(AC_INCLUDE_PATH_EXIST,
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Path to link, already defined dnl Path to link, already defined
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN(AC_LINK_PATH_EXIST, AC_DEFUN(WX_LINK_PATH_EXIST,
[ [
echo "$2" | grep "\-L$1" > /dev/null echo "$2" | grep "\-L$1" > /dev/null
result=$? result=$?
@@ -968,3 +968,97 @@ if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN) AC_DEFINE(WORDS_BIGENDIAN)
fi fi
]) ])
dnl ---------------------------------------------------------------------------
dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
dnl ---------------------------------------------------------------------------
AC_DEFUN(WX_ARG_CACHE_INIT,
[
wx_arg_cache_file="./configarg.cache"
echo "loading argument cache $wx_arg_cache_file"
rm -f ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}
])
AC_DEFUN(WX_ARG_CACHE_FLUSH,
[
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
])
dnl this macro checks for a command line argument and caches the result
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
AC_DEFUN(WX_ARG_WITH,
[
AC_MSG_CHECKING("for --with-$1")
no_cache=0
AC_ARG_WITH($1, $2,
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name)
AC_DEFUN(WX_ARG_ENABLE,
[
AC_MSG_CHECKING("for --enable-$1")
no_cache=0
AC_ARG_ENABLE($1, $2,
[
if test "$enableval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])

411
configure.in
View File

@@ -89,10 +89,17 @@ DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0 DEFAULT_wxUSE_MSW=0
dnl these are the values which are really default for the given platform -
dnl they're not cached and are only used if no --with-toolkit was given *and*
dnl nothing was found in the cache
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
case "${host}" in case "${host}" in
*-hp-hpux* ) *-hp-hpux* )
USE_HPUX=1 USE_HPUX=1
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
AC_DEFINE(__HPUX__) AC_DEFINE(__HPUX__)
;; ;;
*-*-linux* ) *-*-linux* )
@@ -103,14 +110,14 @@ case "${host}" in
USE_ALPHA=1 USE_ALPHA=1
AC_DEFINE(__ALPHA__) AC_DEFINE(__ALPHA__)
fi fi
DEFAULT_wxUSE_GTK=1 DEFAULT_DEFAULT_wxUSE_GTK=1
;; ;;
*-*-irix5* | *-*-irix6* ) *-*-irix5* | *-*-irix6* )
USE_SGI=1 USE_SGI=1
USE_SVR4=1 USE_SVR4=1
AC_DEFINE(__SGI__) AC_DEFINE(__SGI__)
AC_DEFINE(__SVR4__) AC_DEFINE(__SVR4__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-solaris2* ) *-*-solaris2* )
USE_SUN=1 USE_SUN=1
@@ -119,7 +126,7 @@ case "${host}" in
AC_DEFINE(__SUN__) AC_DEFINE(__SUN__)
AC_DEFINE(__SOLARIS__) AC_DEFINE(__SOLARIS__)
AC_DEFINE(__SVR4__) AC_DEFINE(__SVR4__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-sunos4* ) *-*-sunos4* )
USE_SUN=1 USE_SUN=1
@@ -128,35 +135,35 @@ case "${host}" in
AC_DEFINE(__SUN__) AC_DEFINE(__SUN__)
AC_DEFINE(__SUNOS__) AC_DEFINE(__SUNOS__)
AC_DEFINE(__BSD__) AC_DEFINE(__BSD__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-freebsd* | *-*-netbsd*) *-*-freebsd* | *-*-netbsd*)
USE_BSD=1 USE_BSD=1
USE_FREEBSD=1 USE_FREEBSD=1
AC_DEFINE(__FREEBSD__) AC_DEFINE(__FREEBSD__)
AC_DEFINE(__BSD__) AC_DEFINE(__BSD__)
DEFAULT_wxUSE_GTK=1 DEFAULT_DEFAULT_wxUSE_GTK=1
;; ;;
*-*-osf* ) *-*-osf* )
USE_ALPHA=1 USE_ALPHA=1
USE_OSF=1 USE_OSF=1
AC_DEFINE(__ALPHA__) AC_DEFINE(__ALPHA__)
AC_DEFINE(__OSF__) AC_DEFINE(__OSF__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-dgux5* ) *-*-dgux5* )
USE_ALPHA=1 USE_ALPHA=1
USE_SVR4=1 USE_SVR4=1
AC_DEFINE(__ALPHA__) AC_DEFINE(__ALPHA__)
AC_DEFINE(__SVR4__) AC_DEFINE(__SVR4__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-sysv5* ) *-*-sysv5* )
USE_SYSV=1 USE_SYSV=1
USE_SVR4=1 USE_SVR4=1
AC_DEFINE(__SYSV__) AC_DEFINE(__SYSV__)
AC_DEFINE(__SVR4__) AC_DEFINE(__SVR4__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-aix* ) *-*-aix* )
USE_AIX=1 USE_AIX=1
@@ -165,7 +172,7 @@ case "${host}" in
AC_DEFINE(__AIX__) AC_DEFINE(__AIX__)
AC_DEFINE(__SYSV__) AC_DEFINE(__SYSV__)
AC_DEFINE(__SVR4__) AC_DEFINE(__SVR4__)
DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*) *)
AC_MSG_ERROR(unknown system type $(host).) AC_MSG_ERROR(unknown system type $(host).)
@@ -204,6 +211,8 @@ dnl platform should be changed, it can be done here too)
dnl dnl
dnl NB: see also DEFAULT_wxUSE<toolkit> variables defined above dnl NB: see also DEFAULT_wxUSE<toolkit> variables defined above
WX_ARG_CACHE_INIT
dnl useful to test the compilation with minimum options, define as 0 for normal dnl useful to test the compilation with minimum options, define as 0 for normal
dnl usage dnl usage
DEBUG_CONFIGURE=0 DEBUG_CONFIGURE=0
@@ -216,6 +225,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_INFO=yes
DEFAULT_wxUSE_DEBUG_GDB=yes DEFAULT_wxUSE_DEBUG_GDB=yes
DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_DMALLOC=no
DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_APPLE_IEEE=no
@@ -305,6 +315,7 @@ else
DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_INFO=no
DEFAULT_wxUSE_DEBUG_GDB=no DEFAULT_wxUSE_DEBUG_GDB=no
DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_DMALLOC=no
DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_APPLE_IEEE=yes
@@ -387,41 +398,44 @@ else
DEFAULT_wxUSE_WCSRTOMBS=no DEFAULT_wxUSE_WCSRTOMBS=no
fi fi
dnl AC_ARG_WITH should be used to select whether an external package will be dnl WX_ARG_WITH should be used to select whether an external package will be
dnl used or not, to configure compile-time features of this package itself, dnl used or not, to configure compile-time features of this package itself,
dnl use AC_ARG_ENABLE instead dnl use WX_ARG_ENABLE instead
dnl ============================ dnl ============================
dnl external package dependecies dnl external package dependecies
dnl ============================ dnl ============================
AC_ARG_WITH(gtk-prefix, [ --with-gtk-prefix=PFX prefix where GTK is installed], dnl TODO should support these options!
gtk_config_prefix="$withval", gtk_config_prefix="") dnl
AC_ARG_WITH(gtk-exec-prefix, [ --with-gtk-exec-prefix=PFX exec prefix where GTK is installed], dnl AC_ARG_WITH(gtk-prefix, [ --with-gtk-prefix=PFX prefix where GTK is installed],
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") dnl gtk_config_prefix="$withval", gtk_config_prefix="")
AC_ARG_WITH(gtk, [ --with-gtk use GTK+], dnl AC_ARG_WITH(gtk-exec-prefix,
[wxUSE_GTK="$withval" TOOLKIT_GIVEN=1]) dnl [ --with-gtk-exec-prefix=PFX exec prefix where GTK is installed], gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif],
[wxUSE_MOTIF="$withval" TOOLKIT_GIVEN=1])
AC_ARG_WITH(cygwin, [ --with-cygwin use Cygwin for MS-Windows],
[wxUSE_CYGWIN="$withval" TOOLKIT_GIVEN=1])
AC_ARG_WITH(mingw, [ --with-mingw use GCC Minimal MS-Windows],
[wxUSE_MINGW="$withval" TOOLKIT_GIVEN=1])
AC_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], dnl these options use AC_ARG_WITH and not WX_ARG_WITH on purpose - we cache
wxUSE_DMALLOC="$withval",wxUSE_DMALLOC=$DEFAULT_wxUSE_DMALLOC) dnl these values manually
AC_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], for toolkit in GTK MOTIF MSW; do
wxUSE_ZLIB="$withval",wxUSE_ZLIB=$DEFAULT_wxUSE_ZLIB) LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}`
AC_ARG_WITH(libpng, [ --with-libpng use libpng (PNG image format)], if test "x$LINE" != x ; then
wxUSE_LIBPNG="$withval",wxUSE_LIBPNG=$DEFAULT_wxUSE_LIBPNG) has_toolkit_in_cache=1
AC_ARG_WITH(libgif, [ --with-libgif use libgif (GIF file format)], eval "DEFAULT_$LINE"
wxUSE_LIBGIF="${withval}",wxUSE_LIBGIF=$DEFAULT_wxUSE_LIBGIF) echo $LINE >> ${wx_arg_cache_file}.tmp
AC_ARG_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], fi
wxUSE_LIBJPEG="${withval}",wxUSE_LIBJPEG=$DEFAULT_wxUSE_LIBJPEG) done
AC_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)],
wxUSE_OPENGL="$withval",wxUSE_OPENGL=$DEFAULT_wxUSE_OPENGL) AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" TOOLKIT_GIVEN=1])
AC_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" TOOLKIT_GIVEN=1])
wxUSE_ODBC="$withval",wxUSE_ODBC=$DEFAULT_wxUSE_ODBC) AC_ARG_WITH(cygwin, [ --with-cygwin use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" TOOLKIT_GIVEN=1])
AC_ARG_WITH(mingw, [ --with-mingw use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" TOOLKIT_GIVEN=1])
WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
WX_ARG_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
WX_ARG_WITH(libgif, [ --with-libgif use libgif (GIF file format)], wxUSE_LIBGIF)
WX_ARG_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
dnl ==================== dnl ====================
dnl compile-time options dnl compile-time options
@@ -431,12 +445,9 @@ dnl ---------------------------------------------------------------------------
dnl compile options dnl compile options
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE)
wxUSE_OPTIMISE="$enableval",wxUSE_OPTIMISE=$DEFAULT_wxUSE_OPTIMISE) WX_ARG_ENABLE(optimize, [ --enable-optimize create optimized code], wxUSE_OPTIMISE)
AC_ARG_ENABLE(optimize, [ --enable-optimize create optimized code], WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
wxUSE_OPTIMISE="$enableval",wxUSE_OPTIMISE=$DEFAULT_wxUSE_OPTIMISE)
AC_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info],
wxUSE_DEBUG="${enableval}",wxUSE_DEBUG=$DEFAULT_wxUSE_DEBUG)
if test "$wxUSE_DEBUG" = "yes"; then if test "$wxUSE_DEBUG" = "yes"; then
DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_FLAG=yes
@@ -446,18 +457,12 @@ elif test "$wxUSE_DEBUG" = "no"; then
DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_INFO=no
fi fi
AC_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], WX_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
wxUSE_DEBUG_FLAG="$enableval",wxUSE_DEBUG_FLAG=$DEFAULT_wxUSE_DEBUG_FLAG) WX_ARG_ENABLE(debug_info, [ --enable-debug_info create code with debugging information], wxUSE_DEBUG_INFO)
AC_ARG_ENABLE(debug_info, [ --enable-debug_info create code with debugging information], WX_ARG_ENABLE(debug_gdb, [ --enable-debug_gdb create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
wxUSE_DEBUG_INFO="$enableval",wxUSE_DEBUG_INFO=$DEFAULT_wxUSE_DEBUG_INFO) WX_ARG_ENABLE(debug_cntxt, [ --enable-debug_cntxt use wxDebugContext], wxUSE_DEBUG_CONTEXT)
AC_ARG_ENABLE(debug_gdb, [ --enable-debug_gdb create code with extra GDB debugging information], WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory tracing], wxUSE_MEM_TRACING)
wxUSE_DEBUG_GDB="$enableval",wxUSE_DEBUG_GDB=$DEFAULT_wxUSE_DEBUG_GDB) WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE)
AC_ARG_ENABLE(debug_cntxt, [ --enable-debug_cntxt use wxDebugContext],
AC_DEFINE(wxUSE_DEBUG_CONTEXT))
AC_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory tracing],
wxUSE_MEM_TRACING="$enableval", wxUSE_MEM_TRACING=$DEFAULT_wxUSE_MEM_TRACING)
AC_ARG_ENABLE(profile, [ --enable-profile create code with profiling information],
wxUSE_PROFILE="$enableval",wxUSE_PROFILE=$DEFAULT_wxUSE_PROFILE)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl --disable-gui will build only non-GUI part of wxWindows dnl --disable-gui will build only non-GUI part of wxWindows
@@ -466,112 +471,78 @@ dnl NB: this is still in testing stage, don't use if you don't know what you're
dnl doing dnl doing
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(gui, [ --enable-gui use GUI classes], WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
wxUSE_GUI="$enableval",wxUSE_GUI=$DEFAULT_wxUSE_GUI)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl (small) optional non GUI classes dnl (small) optional non GUI classes
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(intl, [ --enable-intl use internationalization system], WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL)
wxUSE_INTL="$enableval",wxUSE_INTL=$DEFAULT_wxUSE_INTL) WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG)
AC_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS)
wxUSE_CONFIG="$enableval",wxUSE_CONFIG=$DEFAULT_wxUSE_CONFIG) WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC)
AC_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE)
wxUSE_SOCKETS="$enableval",wxUSE_SOCKETS=$DEFAULT_wxUSE_SOCKETS) WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE)
AC_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION)
wxUSE_IPC="$enableval",wxUSE_IPC=$DEFAULT_wxUSE_IPC) WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
AC_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG)
wxUSE_APPLE_IEEE="$enableval",wxUSE_APPLE_IEEE=$DEFAULT_wxUSE_APPLE_IEEE) WX_ARG_ENABLE(log, [ --enable-log use logging system], wxUSE_LOG)
AC_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS)
wxUSE_TIMEDATE="$enableval",wxUSE_TIMEDATE=$DEFAULT_wxUSE_TIMEDATE) WX_ARG_ENABLE(file, [ --enable-file use wxFile classes], wxUSE_FILE)
AC_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile classes], wxUSE_TEXTFILE)
wxUSE_FRACTION="$enableval",wxUSE_FRACTION=$DEFAULT_wxUSE_FRACTION) WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
AC_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], WX_ARG_ENABLE(wcsrtombs, [ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs], wxUSE_WCSRTOMBS)
wxUSE_DYNLIB_CLASS="$enableval",wxUSE_DYNLIB_CLASS=$DEFAULT_wxUSE_DYNLIB_CLASS) WX_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick support (Linux only)], wxUSE_JOYSTICK)
AC_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class],
wxUSE_LONGLONG="${enableval}",wxUSE_LONGLONG=$DEFAULT_wxUSE_LONGLONG)
AC_ARG_ENABLE(log, [ --enable-log use logging system],
wxUSE_LOG="$enableval",wxUSE_LOG=$DEFAULT_wxUSE_LOG)
AC_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes],
wxUSE_STREAMS="$enableval",wxUSE_STREAMS=$DEFAULT_wxUSE_STREAMS)
AC_ARG_ENABLE(file, [ --enable-file use wxFile classes],
wxUSE_FILE="$enableval",wxUSE_FILE=$DEFAULT_wxUSE_FILE)
AC_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile classes],
wxUSE_TEXTFILE="$enableval",wxUSE_TEXTFILE=$DEFAULT_wxUSE_TEXTFILE)
AC_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support],
wxUSE_UNICODE="$enableval",wxUSE_UNICODE=$DEFAULT_wxUSE_UNICODE)
AC_ARG_ENABLE(wcsrtombs, [ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs],
wxUSE_WCSRTOMBS="$enableval",wxUSE_WCSRTOMBS=$DEFAULT_wxUSE_WCSRTOMBS)
AC_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick support (Linux only)],
wxUSE_JOYSTICK="$enableval", wxUSE_JOYSTICK=$DEFAULT_wxUSE_JOYSTICK)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl "big" options (i.e. those which change a lot of things throughout the library) dnl "big" options (i.e. those which change a lot of things throughout the library)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(threads, [ --enable-threads use threads], WX_ARG_ENABLE(threads, [ --enable-threads use threads], wxUSE_THREADS)
wxUSE_THREADS="${enableval}",wxUSE_THREADS=$DEFAULT_wxUSE_THREADS) WX_ARG_ENABLE(serial, [ --enable-serial use class serialization], wxUSE_SERIAL)
AC_ARG_ENABLE(serial, [ --enable-serial use class serialization],
wxUSE_SERIAL="${enableval}",wxUSE_SERIAL=$DEFAULT_wxUSE_SERIAL)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl "big" GUI options dnl "big" GUI options
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(docview, [ --enable-docview use document view architecture], WX_ARG_ENABLE(docview, [ --enable-docview use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE)
wxUSE_DOC_VIEW_ARCHITECTURE="$enableval",wxUSE_DOC_VIEW_ARCHITECTURE=$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE) WX_ARG_ENABLE(help, [ --enable-help use help (using external browser at present)], wxUSE_HELP)
AC_ARG_ENABLE(help, [ --enable-help use help (using external browser at present)], WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS)
wxUSE_HELP="$enableval",wxUSE_HELP=$DEFAULT_wxUSE_HELP) WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
AC_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
wxUSE_CONSTRAINTS="$enableval",wxUSE_CONSTRAINTS=$DEFAULT_wxUSE_CONSTRAINTS)
AC_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture],
wxUSE_PRINTING_ARCHITECTURE="${enableval}",wxUSE_PRINTING_ARCHITECTURE=$DEFAULT_wxUSE_PRINTING_ARCHITECTURE)
AC_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture],
wxUSE_MDI_ARCHITECTURE="${enableval}",wxUSE_MDI_ARCHITECTURE=$DEFAULT_wxUSE_MDI_ARCHITECTURE)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl PostScript options dnl PostScript options
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], WX_ARG_ENABLE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
wxUSE_POSTSCRIPT="$enableval",wxUSE_POSTSCRIPT=$DEFAULT_wxUSE_POSTSCRIPT)
dnl VZ: these options seem to be always on, if someone wants to change it please do dnl VZ: these options seem to be always on, if someone wants to change it please do
dnl AC_ARG_ENABLE(PS-normalized, [ --enable-PS-normalized use normalized PS fonts], dnl WX_ARG_ENABLE(PS-normalized, [ --enable-PS-normalized use normalized PS fonts], dnl wxUSE_NORMALIZED_PS_FONTS)
dnl wxUSE_NORMALIZED_PS_FONTS="${enableval}",wxUSE_NORMALIZED_PS_FONTS=$DEFAULT_wxUSE_NORMALIZED_PS_FONTS) dnl WX_ARG_ENABLE(afmfonts, [ --enable-afmfonts use Adobe Font Metric Font table], dnl wxUSE_AFM_FOR_POSTSCRIPT)
dnl AC_ARG_ENABLE(afmfonts, [ --enable-afmfonts use Adobe Font Metric Font table],
dnl wxUSE_AFM_FOR_POSTSCRIPT="${enableval}",wxUSE_AFM_FOR_POSTSCRIPT=$DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl resources dnl resources
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], WX_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], wxUSE_PROLOGIO)
wxUSE_PROLOGIO="${enableval}",wxUSE_PROLOGIO=$DEFAULT_wxUSE_PROLOGIO) WX_ARG_ENABLE(resources, [ --enable-resources use wxWindows resources], wxUSE_RESOURCES)
AC_ARG_ENABLE(resources, [ --enable-resources use wxWindows resources],
wxUSE_RESOURCES="${enableval}",wxUSE_RESOURCES=$DEFAULT_wxUSE_RESOURCES) WX_ARG_ENABLE(xresources, [ --enable-xresources use X resources for save (default for gtk+)], wxUSE_X_RESOURCES)
AC_ARG_ENABLE(xresources, [ --enable-xresources use X resources for save (default for gtk+)],
wxUSE_X_RESOURCES="${enableval}",wxUSE_X_RESOURCES=$DEFAULT_wxUSE_X_RESOURCES)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl IPC &c dnl IPC &c
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(clipboard, [ --enable-clipboard use wxClipboard classes],
wxUSE_CLIPBOARD="${enableval}",wxUSE_CLIPBOARD=$DEFAULT_wxUSE_CLIPBOARD)
AC_ARG_ENABLE(dnd, [ --enable-dnd use Drag'n'Drop classes],
wxUSE_DRAG_AND_DROP="${enableval}",wxUSE_DRAG_AND_DROP=$DEFAULT_wxUSE_DRAG_AND_DROP)
dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(clipboard, [ --enable-clipboard use wxClipboard classes], wxUSE_CLIPBOARD)
dnl options which don't work yet WX_ARG_ENABLE(dnd, [ --enable-dnd use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(wxtree, [ --enable-wxtree make wxTree library], dnl TODO: doesn't work yet
wxUSE_WXTREE="${enableval}",wxUSE_WXTREE=$DEFAULT_wxUSE_WXTREE) WX_ARG_ENABLE(wxtree, [ --enable-wxtree make wxTree library], wxUSE_WXTREE)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl optional GUI controls (in alphabetical order except the first one) dnl optional GUI controls (in alphabetical order except the first one)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(controls, [ --enable-controls use all usual controls], WX_ARG_ENABLE(controls, [ --enable-controls use all usual controls], wxUSE_CONTROLS)
wxUSE_CONTROLS="${enableval}")
dnl even with --enable-controls, some may be disabled by giving dnl even with --enable-controls, some may be disabled by giving
dnl --disable-<control> later on the command line - but by default all will be dnl --disable-<control> later on the command line - but by default all will be
@@ -634,87 +605,68 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TREECTRL=no DEFAULT_wxUSE_TREECTRL=no
fi fi
AC_ARG_ENABLE(accel, [ --enable-accel use accelerators], WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL)
wxUSE_ACCEL="${enableval}",wxUSE_ACCEL=$DEFAULT_wxUSE_ACCEL) WX_ARG_ENABLE(caret, [ --enable-caret use wxCaret class], wxUSE_CARET)
AC_ARG_ENABLE(caret, [ --enable-caret use wxCaret class], WX_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON)
wxUSE_CARET="${enableval}",wxUSE_CARET=$DEFAULT_wxUSE_CARET) WX_ARG_ENABLE(checkbox, [ --enable-checkbox use wxCheckBox class], wxUSE_CHECKBOX)
AC_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
wxUSE_BMPBUTTON="${enableval}",wxUSE_BMPBUTTON=$DEFAULT_wxUSE_BMPBUTTON) WX_ARG_ENABLE(combobox, [ --enable-combobox use wxChoice and wxComboBox classes], wxUSE_COMBOBOX)
AC_ARG_ENABLE(checkbox, [ --enable-checkbox use wxCheckBox class], WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
wxUSE_CHECKBOX="${enableval}",wxUSE_CHECKBOX=$DEFAULT_wxUSE_CHECKBOX) WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
AC_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbox with checkboxes) class], WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST)
wxUSE_CHECKLST="${enableval}",wxUSE_CHECKLST=$DEFAULT_wxUSE_CHECKLST) WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX)
AC_ARG_ENABLE(combobox, [ --enable-combobox use wxChoice and wxComboBox classes], WX_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL)
wxUSE_COMBOBOX="${enableval}",wxUSE_COMBOBOX=$DEFAULT_wxUSE_COMBOBOX) WX_ARG_ENABLE(notebook, [ --enable-notebook use wxNotebook class], wxUSE_NOTEBOOK)
AC_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], WX_ARG_ENABLE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX)
wxUSE_GAUGE="${enableval}",wxUSE_GAUGE=$DEFAULT_wxUSE_GAUGE) WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN)
AC_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH)
wxUSE_GRID="${enableval}",wxUSE_GRID=$DEFAULT_wxUSE_GRID) WX_ARG_ENABLE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
AC_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], WX_ARG_ENABLE(slider, [ --enable-slider use wxSlider class], wxUSE_SLIDER)
wxUSE_IMAGLIST="${enableval}",wxUSE_IMAGLIST=$DEFAULT_wxUSE_IMAGLIST) WX_ARG_ENABLE(spinbtn, [ --enable-spinbtn use wxSpinButton class], wxUSE_SPINBTN)
AC_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], WX_ARG_ENABLE(splitter, [ --enable-splitter use wxSplitterWindow class], wxUSE_SPLITTER)
wxUSE_LISTBOX="${enableval}",wxUSE_LISTBOX=$DEFAULT_wxUSE_LISTBOX) WX_ARG_ENABLE(statbmp, [ --enable-statbmp use wxStaticBitmap class], wxUSE_STATBMP)
AC_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], WX_ARG_ENABLE(statbox, [ --enable-statbox use wxStaticBox class], wxUSE_STATBOX)
wxUSE_LISTCTRL="${enableval}",wxUSE_LISTCTRL=$DEFAULT_wxUSE_LISTCTRL) WX_ARG_ENABLE(statline, [ --enable-statline use wxStaticLine class], wxUSE_STATLINE)
AC_ARG_ENABLE(notebook, [ --enable-notebook use wxNotebook class], WX_ARG_ENABLE(statusbar, [ --enable-statusbar use wxStatusBar class], wxUSE_STATUSBAR)
wxUSE_NOTEBOOK="${enableval}",wxUSE_NOTEBOOK=$DEFAULT_wxUSE_NOTEBOOK) WX_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TABDIALOG)
AC_ARG_ENABLE(radiobox, [ --enable-radiobox use wxRadioBox class], WX_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR)
wxUSE_RADIOBOX="${enableval}",wxUSE_RADIOBOX=$DEFAULT_wxUSE_RADIOBOX) WX_ARG_ENABLE(treectrl, [ --enable-treectrl use wxTreeCtrl class], wxUSE_TREECTRL)
AC_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class],
wxUSE_RADIOBTN="${enableval}",wxUSE_RADIOBTN=$DEFAULT_wxUSE_RADIOBTN)
AC_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class],
wxUSE_SASH="${enableval}",wxUSE_SASH=$DEFAULT_wxUSE_SASH)
AC_ARG_ENABLE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows],
wxUSE_SCROLLBAR="${enableval}",wxUSE_SCROLLBAR=$DEFAULT_wxUSE_SCROLLBAR)
AC_ARG_ENABLE(slider, [ --enable-slider use wxSlider class],
wxUSE_SLIDER="${enableval}",wxUSE_SLIDER=$DEFAULT_wxUSE_SLIDER)
AC_ARG_ENABLE(spinbtn, [ --enable-spinbtn use wxSpinButton class],
wxUSE_SPINBTN="${enableval}",wxUSE_SPINBTN=$DEFAULT_wxUSE_SPINBTN)
AC_ARG_ENABLE(splitter, [ --enable-splitter use wxSplitterWindow class],
wxUSE_SPLITTER="${enableval}",wxUSE_SPLITTER=$DEFAULT_wxUSE_SPLITTER)
AC_ARG_ENABLE(statbmp, [ --enable-statbmp use wxStaticBitmap class],
wxUSE_STATBMP="${enableval}",wxUSE_STATBMP=$DEFAULT_wxUSE_STATBMP)
AC_ARG_ENABLE(statbox, [ --enable-statbox use wxStaticBox class],
wxUSE_STATBOX="${enableval}",wxUSE_STATBOX=$DEFAULT_wxUSE_STATBOX)
AC_ARG_ENABLE(statline, [ --enable-statline use wxStaticLine class],
wxUSE_STATLINE="${enableval}",wxUSE_STATLINE=$DEFAULT_wxUSE_STATLINE)
AC_ARG_ENABLE(statusbar, [ --enable-statusbar use wxStatusBar class],
wxUSE_STATUSBAR="${enableval}",wxUSE_STATUSBAR=$DEFAULT_wxUSE_STATUSBAR)
AC_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class],
wxUSE_TABDIALOG="${enableval}",wxUSE_TABDIALOG=$DEFAULT_wxUSE_TABDIALOG)
AC_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class],
wxUSE_TOOLBAR="${enableval}",wxUSE_TOOLBAR=$DEFAULT_wxUSE_TOOLBAR)
AC_ARG_ENABLE(treectrl, [ --enable-treectrl use wxTreeCtrl class],
wxUSE_TREECTRL="${enableval}",wxUSE_TREECTRL=$DEFAULT_wxUSE_TREECTRL)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl misc GUI options dnl misc GUI options
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(commondlg, [ --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], WX_ARG_ENABLE(commondlg, [ --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], wxUSE_COMMONDLGS)
wxUSE_COMMONDLGS="${enableval}",wxUSE_COMMONDLGS=$DEFAULT_wxUSE_COMMONDLGS) WX_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME)
AC_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS)
wxUSE_MINIFRAME="${enableval}",wxUSE_MINIFRAME=$DEFAULT_wxUSE_MINIFRAME) WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES)
AC_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
wxUSE_TOOLTIPS="${enableval}",wxUSE_TOOLTIPS=$DEFAULT_wxUSE_TOOLTIPS)
AC_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], dnl cache the options values before (may be) aborting below
wxUSE_SPLINES="${enableval}",wxUSE_SPLINES=$DEFAULT_wxUSE_SPLINES) WX_ARG_CACHE_FLUSH
AC_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes],
wxUSE_VALIDATORS="${enableval}",wxUSE_VALIDATORS=$DEFAULT_wxUSE_VALIDATORS)
dnl check that no more than one toolkit is given and that if none are given that dnl check that no more than one toolkit is given and that if none are given that
dnl we have a default one dnl we have a default one
AC_MSG_CHECKING(for toolkit)
if test "$TOOLKIT_GIVEN" = 1; then if test "$TOOLKIT_GIVEN" = 1; then
dnl convert "yes" to 1 and "no" to 0 dnl convert "yes" to 1 and "no" to 0
wxUSE_GTK=`echo $wxUSE_GTK | sed -e 's/yes/1/' -e 's/no/0/'` for toolkit in GTK MOTIF MSW; do
wxUSE_MOTIF=`echo $wxUSE_MOTIF | sed -e 's/yes/1/' -e 's/no/0/'` var=wxUSE_$toolkit
wxUSE_MSW=`echo $wxUSE_MSW | sed -e 's/yes/1/' -e 's/no/0/'` eval "value=\$${var}"
eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
done
else else
dnl try to guess the most apropriate toolkit for this platform dnl try to guess the most apropriate toolkit for this platform
wxUSE_GTK=$DEFAULT_wxUSE_GTK for toolkit in GTK MOTIF MSW; do
wxUSE_MOTIF=$DEFAULT_wxUSE_MOTIF if test "$has_toolkit_in_cache" != 1; then
wxUSE_MSW=$DEFAULT_wxUSE_MSW var=DEFAULT_DEFAULT_wxUSE_$toolkit
else
var=DEFAULT_wxUSE_$toolkit
fi
eval "wxUSE_$toolkit=\$${var}"
done
fi fi
dnl NB: this supposes that the shell is able to handle arithmetic expansion and dnl NB: this supposes that the shell is able to handle arithmetic expansion and
@@ -725,12 +677,24 @@ case "$NUM_TOOLKITS" in
1) 1)
;; ;;
0) 0)
AC_MSG_ERROR(Please specify a toolkit) AC_MSG_ERROR(Please specify a toolkit - cannot determine the default for ${host})
;; ;;
*) *)
AC_MSG_ERROR(Please specify at most one toolkit) AC_MSG_ERROR(Please specify at most one toolkit (may be some are cached?))
esac esac
dnl cache the wxUSE_<TOOLKIT> values too
for toolkit in GTK MOTIF MSW; do
var=wxUSE_$toolkit
eval "value=\$${var}"
if test "x$value" != x; then
echo "$var=$value" >> ${wx_arg_cache_file}
if test "$value" = 1; then
AC_MSG_RESULT(`echo $toolkit | tr [[A-Z]] [[a-z]]`)
fi
fi
done
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Checks for programs dnl Checks for programs
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -923,20 +887,9 @@ dnl ------------------------------------------------------------------------
dnl Check for libraries dnl Check for libraries
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl flush the cache because checking for libraries might abort dnl flush the cache because checking for libraries below might abort
AC_CACHE_SAVE AC_CACHE_SAVE
dnl find the X11 include and library files
dnl defines x_includes and x_libraries
AC_PATH_XTRA
if test "$no_x" = "yes"; then
AC_MSG_ERROR(X11 libraries not found, aborting)
fi
CHECK_INCLUDE="-I/usr/include $X_CFLAGS"
CHECK_LIB="-L/lib -L/usr/lib $X_LIBS"
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl search for toolkit (widget sets) dnl search for toolkit (widget sets)
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
@@ -965,8 +918,19 @@ if test "$wxUSE_GTK" = 1; then
fi fi
if test "$wxUSE_MOTIF" = 1; then if test "$wxUSE_MOTIF" = 1; then
dnl find the X11 include and library files
dnl defines x_includes and x_libraries
AC_PATH_XTRA
if test "$no_x" = "yes"; then
AC_MSG_ERROR(X11 libraries not found, aborting)
fi
TOOLKIT_INCLUDE="$X_CFLAGS"
GUI_TK_LIBRARY="$X_LIBS"
AC_MSG_CHECKING(for Motif/Lesstif includes) AC_MSG_CHECKING(for Motif/Lesstif includes)
AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
if test "$ac_find_includes" != "" ; then if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes) AC_MSG_RESULT(found $ac_find_includes)
else else
@@ -975,13 +939,13 @@ if test "$wxUSE_MOTIF" = 1; then
fi fi
AC_MSG_CHECKING(for Motif/Lesstif library) AC_MSG_CHECKING(for Motif/Lesstif library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm) WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes, $CHECK_INCLUDE) WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries, $CHECK_LIB) WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
CHECK_LINK="$CHECK_LIB $ac_path_to_link" CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include" TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@@ -989,10 +953,10 @@ if test "$wxUSE_MOTIF" = 1; then
fi fi
AC_MSG_CHECKING(for Xt library) AC_MSG_CHECKING(for Xt library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB) WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
CHECK_LINK="$CHECK_LIB $ac_path_to_link" CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@@ -1001,10 +965,10 @@ if test "$wxUSE_MOTIF" = 1; then
XPM_LINK="" XPM_LINK=""
AC_MSG_CHECKING(for Xpm library) AC_MSG_CHECKING(for Xpm library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB) WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
CHECK_LINK="$CHECK_LIB $ac_path_to_link" CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
XPM_LINK="-lXpm " XPM_LINK="-lXpm "
AC_DEFINE(wxHAVE_LIB_XPM) AC_DEFINE(wxHAVE_LIB_XPM)
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found at $ac_find_libraries)
@@ -1014,7 +978,7 @@ if test "$wxUSE_MOTIF" = 1; then
fi fi
GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -lm" GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -lm"
GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF TOOLKIT=MOTIF
fi fi
@@ -1879,7 +1843,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl TODO some samples are never built so far: dnl TODO some samples are never built so far:
dnl mfc, nativdlg, oleauto, ownerdrw, proplist dnl mfc, nativdlg, oleauto, ownerdrw, proplist
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
forty fractal image wxpoem" forty fractal image notepad wxpoem"
fi fi
dnl for convenience, sort the files to build in alphabetical order dnl for convenience, sort the files to build in alphabetical order
@@ -1950,6 +1914,7 @@ AC_OUTPUT([
Makefile Makefile
src/Makefile src/Makefile
src/gtk/Makefile src/gtk/Makefile
src/motif/Makefile
include/Makefile include/Makefile
include/wx/Makefile include/wx/Makefile
include/wx/generic/Makefile include/wx/generic/Makefile

2
src/gtk/Makefile.am
View File

@@ -1,4 +1,4 @@
## Purpose: The automake makefile for wxWindows. ## Purpose: The automake makefile for wxWindows (src/gtk subdirectory)
## Author: Phil Blecker, Vadim Zeitlin ## Author: Phil Blecker, Vadim Zeitlin
## Version: $Id$ ## Version: $Id$
## ##

2
src/gtk1/Makefile.am
View File

@@ -1,4 +1,4 @@
## Purpose: The automake makefile for wxWindows. ## Purpose: The automake makefile for wxWindows (src/gtk subdirectory)
## Author: Phil Blecker, Vadim Zeitlin ## Author: Phil Blecker, Vadim Zeitlin
## Version: $Id$ ## Version: $Id$
## ##

210
src/motif/Makefile.am Normal file
View File

@@ -0,0 +1,210 @@
## Purpose: The automake makefile for wxWindows (src/motif subdirectory)
## Author: Phil Blecker, Vadim Zeitlin
## Version: $Id$
##
## Process this file with automake to produce Makefile.in
SUFFIXES = .cpp .c
DEFS = $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
LIBS = $(GUILIBS)
VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH}
EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}"
lib_LTLIBRARIES = @WX_LIBRARY_NAME@
EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la
# these are the common files which always make part of the library
libwx_motif_la_SOURCES = \
\
extended.c \
parser.c \
\
cmndata.cpp \
dynarray.cpp \
filefn.cpp \
hash.cpp \
list.cpp \
matrix.cpp \
memory.cpp \
module.cpp \
object.cpp \
string.cpp \
timercmn.cpp \
utilscmn.cpp \
tokenzr.cpp \
variant.cpp \
wxchar.cpp \
\
config.cpp \
date.cpp \
datstrm.cpp \
db.cpp \
dbtable.cpp \
dcbase.cpp \
docmdi.cpp \
docview.cpp \
dynlib.cpp \
event.cpp \
file.cpp \
fileconf.cpp \
framecmn.cpp \
ftp.cpp \
gdicmn.cpp \
helpbase.cpp \
http.cpp \
image.cpp \
imaggif.cpp \
imagjpeg.cpp \
imagpng.cpp \
intl.cpp \
ipcbase.cpp \
layout.cpp \
log.cpp \
longlong.cpp \
mimetype.cpp \
mstream.cpp \
objstrm.cpp \
odbc.cpp \
paper.cpp \
prntbase.cpp \
process.cpp \
protocol.cpp \
resource.cpp \
sckaddr.cpp \
sckfile.cpp \
sckint.cpp \
sckipc.cpp \
sckstrm.cpp \
serbase.cpp \
socket.cpp \
stream.cpp \
tbarbase.cpp \
tbarsmpl.cpp \
textfile.cpp \
time.cpp \
url.cpp \
valgen.cpp \
validate.cpp \
valtext.cpp \
wfstream.cpp \
wincmn.cpp \
wxexpr.cpp \
zstream.cpp \
\
caret.cpp \
choicdgg.cpp \
colrdlgg.cpp \
dcpsg.cpp \
dirdlgg.cpp \
fontdlgg.cpp \
gridg.cpp \
helpext.cpp \
helphtml.cpp \
imaglist.cpp \
laywin.cpp \
listctrl.cpp \
msgdlgg.cpp \
panelg.cpp \
printps.cpp \
prntdlgg.cpp \
progdlgg.cpp \
prop.cpp \
propform.cpp \
proplist.cpp \
sashwin.cpp \
scrolwin.cpp \
splitter.cpp \
statusbr.cpp \
tabg.cpp \
textdlgg.cpp \
treectrl.cpp \
\
threadpsx.cpp \
utilsunx.cpp \
\
accel.cpp \
app.cpp \
bitmap.cpp \
bmpbuttn.cpp \
brush.cpp \
button.cpp \
checkbox.cpp \
checklst.cpp \
choice.cpp \
clipbrd.cpp \
colour.cpp \
combobox.cpp \
control.cpp \
cursor.cpp \
data.cpp \
dataobj.cpp \
dc.cpp \
dcclient.cpp \
dcmemory.cpp \
dcscreen.cpp \
dialog.cpp \
dnd.cpp \
filedlg.cpp \
font.cpp \
frame.cpp \
gauge.cpp \
gdiobj.cpp \
icon.cpp \
listbox.cpp \
main.cpp \
mdi.cpp \
menu.cpp \
minifram.cpp \
notebook.cpp \
palette.cpp \
pen.cpp \
radiobox.cpp \
radiobut.cpp \
region.cpp \
scrolbar.cpp \
settings.cpp \
slider.cpp \
spinbutt.cpp \
statbmp.cpp \
statbox.cpp \
statline.cpp \
stattext.cpp \
textctrl.cpp \
timer.cpp \
tooltip.cpp \
utilsres.cpp \
wave.cpp \
window.cpp
# these are the sources which we build by our own rules
#
# TODO: parser.y can be included into SOURCES, but for the sake of my life I
# don't know where to put lexer.l - if I put it in the sources too,
# automake tries to build lexer.lo... and fails, of course. (VZ)
BUILT_SOURCES = parser.c lexer.c
parser.c: $(srcdir)/../common/parser.y lexer.c
$(YACC) $(srcdir)/../common/parser.y
@sed -e "s;$(srcdir)/../common/y.tab.c;parser.y;g" < y.tab.c | \
sed -e "s/BUFSIZ/5000/g" | \
sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \
sed -e "s/yy/PROIO_yy/g" | \
sed -e "s/input/PROIO_input/g" | \
sed -e "s/unput/PROIO_unput/g" > parser.c
@$(RM) y.tab.c
lexer.c: $(srcdir)/../common/lexer.l
$(LEX) $(srcdir)/../common/lexer.l
@sed -e "s;$(srcdir)/../common/lex.yy.c;lexer.l;g" < lex.yy.c | \
sed -e "s/yy/PROIO_yy/g" | \
sed -e "s/input/PROIO_input/g" | \
sed -e "s/unput/PROIO_unput/g" > lexer.c
@$(RM) lex.yy.c
libwx_motif_la_LDFLAGS = -rpath @libdir@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE)
libwx_motif_la_LIBADD = $(LTLIBOBJS)
libwx_motif_la_DEPENDENCIES = $(libwx_motif_la_LIBADD) lexer.l parser.y