dnl the file passed to AC_INIT should be specific to our package
AC_INIT(wx-config.in)
+dnl sets build, host, target variables and the same with _alias
AC_CANONICAL_SYSTEM
dnl When making releases do:
dnl WX_INTERFACE_AGE = 0
WX_MAJOR_VERSION_NUMBER=2
-WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=14
+WX_MINOR_VERSION_NUMBER=3
+WX_RELEASE_NUMBER=0
WX_INTERFACE_AGE=0
-WX_BINARY_AGE=0
+WX_BINARY_AGE=1
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
USE_OSF=
USE_BSD=
USE_FREEBSD=
+USE_NETBSD=
USE_VMS=
USE_ULTRIX=
USE_CYGWIN=
AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-freebsd* | *-*-netbsd*)
+ *-*-freebsd*)
USE_BSD=1
USE_FREEBSD=1
AC_DEFINE(__FREEBSD__)
AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1
;;
+ *-*-netbsd*)
+ USE_BSD=1
+ USE_NETBSD=1
+ AC_DEFINE(__FREEBSD__)
+ AC_DEFINE(__NETBSD__)
+ DEFAULT_DEFAULT_wxUSE_GTK=1
+ ;;
*-*-osf* )
USE_ALPHA=1
USE_OSF=1
AC_DEFINE(__ALPHA__)
AC_DEFINE(__OSF__)
DEFAULT_DEFAULT_wxUSE_MOTIF=1
+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1
;;
*-*-dgux5* )
USE_ALPHA=1
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
+ DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_FILE=no
DEFAULT_wxUSE_TEXTFILE=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
+ DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_TEXTFILE=yes
WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL)
WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG)
-dnl can't use sockets without GUI so far
-if test "$wxUSE_GUI" = "yes"; then
WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS)
-else
-wxUSE_SOCKETS=no
-fi
-WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER)
WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC)
+
+WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER)
WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE)
WX_ARG_ENABLE(timedate, [ --enable-timedate use date/time classes], wxUSE_TIMEDATE)
WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE)
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
WX_ARG_ENABLE(wcsrtombs, [ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs], wxUSE_WCSRTOMBS)
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
-WX_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick support (Linux only)], wxUSE_JOYSTICK)
WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
WX_ARG_ENABLE(filesystem, [ --enable-filesystem use virtual file systems classes], wxUSE_FILESYSTEM)
WX_ARG_ENABLE(fs_inet, [ --enable-fs_inet use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
WX_ARG_ENABLE(fs_zip, [ --enable-fs_zip use virtual ZIP filesystems], wxUSE_FS_ZIP)
WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM)
+WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
+
dnl ---------------------------------------------------------------------------
dnl "big" options (i.e. those which change a lot of things throughout the library)
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO)
WX_ARG_ENABLE(plot, [ --enable-plot use wxPlot], wxUSE_PLOT)
+WX_ARG_ENABLE(joystick, [ --enable-joystick compile in joystick support (Linux only)], wxUSE_JOYSTICK)
dnl ---------------------------------------------------------------------------
dnl support for image formats that do not rely on external library
dnl cross-compiling support: we're cross compiling if the build system is
dnl different from the target one (assume host and target be always the same)
-if eval "test $host != $build"; then
- if eval "test $host_alias != NONE"; then
+if test "$build" != "$host" ; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
RANLIB=$host_alias-ranlib
DLLTOOL=$host_alias-dlltool
+ RESCOMP=$host_alias-windres
LD=$host_alias-ld
NM=$host_alias-nm
STRIP=$host_alias-strip
- fi
fi
dnl C-compiler checks
mkdir sub
fi
echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
+${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
RESULT=$?
rm -f sub/file check final_file confMake
rmdir sub
GUI_TK_LINK=
WXGTK12=
-WXGTK13=
+WXGTK127=
+WXGTK20=
WXWINE=
if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
if test "$cross_compiling" = "yes" ; then
- AC_MSG_WARN(Cross compiling --- skipping windows.h check)
+ dnl mingw32 will find them even if they're not in one of standard paths
+ AC_MSG_WARN(skipping windows.h check for cross-compilation)
else
AC_MSG_CHECKING(for Windows headers)
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
dnl --- This will bloat the executable, but it'll work for now...
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+ dnl add extra odbc libs if we have compiled in odbc
+ if test "$wxUSE_ODBC" = "yes" ; then
+ LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+ fi
+
dnl -mwindows is needed to avoid that spawning of a console window
if test "$wxUSE_MINGW" = 1; then
LDFLAGS="$LDFLAGS -mwindows"
GENERICOBJS="\$(MSW_GENERICOBJS)"
UNIXOBJS=
GUIDIST=MSW_DIST
+
+ dnl we should calculate these
+ RCINCSWITCH="--include-dir"
+ RCDEFSWITCH="--define"
+ RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
+ RCINPUTSWITCH="-i"
+ RCOUTPUTSWITCH="-o"
+ RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
+
+ dnl set optinal RES_PROGRAM_OPT to RES_PROGRAM
+ RESPROGRAM="\$(RES_PROGRAM)"
+
fi
if test "$wxUSE_GTK" = 1; then
dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
dnl and only then, if it wasn't found, for an older one
- AM_PATH_GTK(1.2.3, WXGTK12=1)
+ AM_PATH_GTK_2_0(1.3.1, WXGTK20=1,[
+ AM_PATH_GTK(1.2.7, WXGTK127=1)
+ AM_PATH_GTK(1.2.3, WXGTK12=1)
+ ], gthread)
- if test "$WXGTK12" != 1; then
+ if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then
AC_MSG_ERROR([
Please check that gtk-config is in path, the directory
where GTK+ libraries are installed (returned by
])
fi
-dnl it doesn't really work with 1.3.0 now...
-dnl AM_PATH_GTK(1.3.0,
-dnl WXGTK13=1,
-dnl AM_PATH_GTK(1.2.1,
-dnl WXGTK12=1,
-dnl AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?)
-dnl )
-dnl )
-
TOOLKIT_INCLUDE="$GTK_CFLAGS"
dnl Appending gthreads as it was done here is not portable, instead
AC_MSG_ERROR(no)
fi
- GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -lm"
+ GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
WXWINE=1
TOOLKIT=MSW
GUIDIST=MSW_DIST
fi
-if test "$wxUSE_MOTIF" = 1; then
- dnl use standard macros to check for X headers/libs, this brings support
- dnl for the standard configure options --x-includes and --x-libraries
- AC_PATH_XTRA
+dnl use standard macros to check for X headers/libs, this brings support
+dnl for the standard configure options --x-includes and --x-libraries;
+dnl the path to the X headers/libs is not only needed for motif, but also
+dnl by the OpenGL and XKBlib.h checks further down
+AC_PATH_XTRA
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+LDFLAGS="$LDFLAGS $X_LIBS"
+
+if test "$wxUSE_MOTIF" = 1; then
if test "$no_x" = "yes"; then
- AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
+ AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
fi
GUI_TK_LIBRARY="$X_LIBS"
version = XpmLibraryVersion();
],
[
- XPM_LINK="-lXpm "
- AC_DEFINE(wxHAVE_LIB_XPM)
+ XPM_LINK="-lXpm "
+ AC_DEFINE(wxHAVE_LIB_XPM)
AC_MSG_RESULT(found in default search path)
COMPILED_X_PROGRAM=0
],
)
fi
- GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm"
+ GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF
TOOLKIT_DIR="os2"
fi
+ dnl the (base) name of the library and support files for this toolkit
+ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+ TOOLKIT_NAME="${TOOLKIT_DIR}d"
+ else
+ TOOLKIT_NAME="${TOOLKIT_DIR}"
+ fi
+
dnl the symbol which allows conditional compilation for the given toolkit
TOOLKIT_DEF="-D__WX${TOOLKIT}__"
dnl the name of the (libtool) library
- WX_LIBRARY="wx_${TOOLKIT_DIR}"
+ WX_LIBRARY="wx_${TOOLKIT_NAME}"
dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
else
USE_GUI=0
+ dnl this may be (almost) unneccesary for wxBase now we use TOOLKIT_NAME
TOOLKIT_DIR="base"
+
+ dnl the base name of the library and wxXXX-config files
+ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+ TOOLKIT_NAME="${TOOLKIT_DIR}d"
+ else
+ TOOLKIT_NAME="${TOOLKIT_DIR}"
+ fi
+
TOOLKIT_DEF="-D__WXBASE__"
dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"
+ if test "$wxUSE_ZLIB" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+ fi
+
dnl building wxBase only
- WX_LIBRARY="wxbase"
+ WX_LIBRARY="wx_${TOOLKIT_NAME}"
PORT_FILES="src/files.lst"
RPM_FILES="src/rpmfiles.lst"
WX_ALL=
WX_ALL_INSTALLED=
BURNT_LIBRARY_NAME=
+WX_TARGET_LIBRARY_SONAME=
dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
SHARED_LD="${CC} -shared -fPIC -o"
PIC_FLAG="-fPIC"
else
+ dnl no idea why it wants it, but it does
+ LDFLAGS="-L/usr/lib"
+
SHARED_LD="${CXX} -b -o"
PIC_FLAG="+Z"
fi
- WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
- WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl"
+ WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl"
+ WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl"
if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
else
WX_ALL="${WX_LIBRARY_NAME_SHARED}"
if test "$wxUSE_BURNT_NAME" = "yes" ; then
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+ dnl substitute this in makelib.env for the contrib libs
+ WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
fi
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
if test "$GCC" = yes ; then
SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
+
+ dnl newer versions of gcc need -isystem to compile X headers on
+ dnl Solaris (which use old style C syntax)
+ CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
else
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
*-*-freebsd* | *-*-netbsd*)
SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
- WX_ALL="CREATE_LINKS"
+ if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+ WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+ else
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ fi
;;
*-*-osf* )
SHARED_LD="${CXX} -shared -o"
dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
- WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="preinstall_gl"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+ else
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ fi
;;
*-*-mingw32* )
dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
- WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="preinstall_gl"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+ else
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ fi
;;
*-pc-os2_emx )
dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
fi
+ dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
+ WX_TARGET_LIBRARY_TYPE="so"
else
dnl set target to static
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
- WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+
+ if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="preinstall_gl"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+ else
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ fi
+
+ dnl give static wxBase build a working install target
+ if test "$wxUSE_GUI" = "no"; then
+ dnl we're here because WX_ALL_INSTALLED is empty, but play safe anyway
+ WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+ fi
+
+ WX_TARGET_LIBRARY_TYPE="a"
fi
dnl ------------------------------------------------------------------------
AC_CHECK_HEADERS(wcstr.h)
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
+dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
+AC_CHECK_HEADERS(iconv.h)
+dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
+AC_CHECK_HEADERS(langinfo.h)
if test "$wxUSE_GUI" = "yes"; then
- dnl defines HAVE_X11_XKBLIB_H
- AC_CHECK_HEADERS(X11/XKBlib.h)
+ if test "$wxUSE_UNIX" = "yes"; then
+ dnl defines HAVE_X11_XKBLIB_H
+ AC_CHECK_HEADERS(X11/XKBlib.h)
+ fi
fi
dnl ---------------------------------------------------------------------------
],
[
wx_cv_struct_pw_gecos=yes
- AC_DEFINE(HAVE_PW_GECOS)
],
[
wx_cv_struct_pw_gecos=no
]
)
+if test "$wx_cv_struct_pw_gecos" = "yes"; then
+ AC_DEFINE(HAVE_PW_GECOS)
+fi
+
dnl ---------------------------------------------------------------------------
dnl Checks for compiler characteristics
dnl ---------------------------------------------------------------------------
dnl cross-compiling)
dnl defines the size of certain types of variables in SIZEOF_<TYPE>
AC_CHECK_SIZEOF(char, 1)
+AC_CHECK_SIZEOF(wchar_t, 4)
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(int *, 4)
AC_CHECK_SIZEOF(int, 4)
dnl check for vprintf/vsprintf() which are GNU extensions
AC_FUNC_VPRINTF
-dnl check for vsnprintf() - a safe version of vsprintf()
-AC_CHECK_FUNCS(vsnprintf,
- AC_DEFINE(HAVE_VSNPRINTF),
- AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
- )
-
-dnl check for vsscanf() - on some platforms (Linux, glibc 2.1.1) it's
-dnl available in the library but the prototype is missing, so we can't use
-dnl AC_CHECK_FUNCS here, do it manually
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf,
+dnl check for vsscanf() and vsnprintf() - on some platforms (Linux, glibc
+dnl 2.1.1 for the first one, HP-UX for the second) it's available in the
+dnl library but the prototype is missing, so we can't use AC_CHECK_FUNCS here,
+dnl do it manually
+
+dnl we use AC_TRY_COMPILE() here instead of AC_TRY_RUN() to make the checks
+dnl work for cross-compilation, but AC_TRY_COMPILE() normally only compiles
+dnl one function while we need at least 2 - hence the ugly hack below. To
+dnl understand why it works, remember that AC_TRY_COMPILE() just prepends
+dnl "int main() {" in the beginning of the code and "; return 0; }" at the
+dnl end...
+
+dnl check for vsnprintf() - a safe version of vsprintf()
+AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
[
- AC_TRY_RUN(
- [
- #include <stdio.h>
- #include <stdarg.h>
+ AC_TRY_COMPILE([
+ #include <stdio.h>
+ #include <stdarg.h>
+ ], [
+ int wx_test_vsnprintf(const char *, ...);
- int try_vsscanf(const char *format, ...)
- {
- va_list ap;
- va_start(ap, format);
+ wx_test_vsnprintf("%s");
+ return 0;
+ }
+
+ int wx_test_vsnprintf(const char *fmt, ...)
+ {
+ char *s;
- vsscanf("17", format, ap);
+ va_list argp;
+ va_start(argp, fmt);
+ vsnprintf(s, 42, fmt, argp);
+ va_end(argp);
+ ], [
+ AC_DEFINE(HAVE_VSNPRINTF)
+ wx_cv_func_vsnprintf=yes
+ ], [
+ AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
+ wx_cv_func_vsnprintf=no
+ ])
+])
- va_end(ap);
+dnl check for vsscanf()
+AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf,
+[
+ AC_TRY_COMPILE([
+ #include <stdio.h>
+ #include <stdarg.h>
+ ], [
+ int wx_test_vsscanf(const char *, ...);
+
+ wx_test_vsscanf("%d");
+ return 0;
}
- int main()
+ int wx_test_vsscanf(const char *fmt, ...)
{
- int i;
- try_vsscanf("%d", &i);
- return i == 17 ? 0 : 1;
- }
- ], [
- AC_DEFINE(HAVE_VSSCANF)
- wx_cv_func_vsscanf=yes
- ],
- wx_cv_func_vsscanf=no,
- wx_cv_func_vsscanf=no
- )
+ va_list argp;
+ va_start(argp, fmt);
+ vsscanf("42", fmt, argp);
+ va_end(argp);
+ ], [
+ AC_DEFINE(HAVE_VSSCANF)
+ wx_cv_func_vsscanf=yes
+ ], [
+ wx_cv_func_vsscanf=no
+ ])
])
AC_LANG_RESTORE
-dnl under MSW we always have Sleep()
+dnl the following tests are for Unix(like) systems only
if test "$TOOLKIT" != "MSW"; then
+dnl check for POSIX signals if we need them
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+ AC_CHECK_FUNCS(sigaction)
+
+ if test "$ac_cv_func_sigaction" = "no"; then
+ AC_MSG_WARN([No POSIX signal functions on this system, wxApp::OnFatalException will not be called])
+ wxUSE_ON_FATAL_EXCEPTION=no
+ fi
+
+ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+
+ AC_CACHE_CHECK([for sa_handler type], wx_cv_type_sa_handler,
+ [
+ AC_TRY_COMPILE([#include <signal.h>],
+ [
+ extern void testSigHandler(int);
+
+ struct sigaction sa;
+ sa.sa_handler = testSigHandler;
+ ], [
+ wx_cv_type_sa_handler=int
+ ], [
+ wx_cv_type_sa_handler=void
+ ])
+ ])
+
+ AC_LANG_RESTORE
+
+ AC_DEFINE_UNQUOTED(wxTYPE_SA_HANDLER, $wx_cv_type_sa_handler)
+ fi
+fi
+
dnl check for vfork() (even if it's the same as fork() in modern Unices)
AC_CHECK_FUNCS(vfork)
dnl check for uname (POSIX) and gethostname (BSD)
AC_CHECK_FUNCS(uname gethostname, break)
-dnl check for MT-safe version of strtok
+dnl check for MT-safe version of strtok (on DEC Alpha, it's ok for C compiler
+dnl but not for C++ one - hence change language)
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
AC_CHECK_FUNCS(strtok_r)
+AC_LANG_RESTORE
+
dnl check for inet_addr and inet_aton (these may live either in libc, or in
dnl libnsl or libresolv)
INET_LINK=
if test "$wxUSE_THREADS" = "yes" ; then
dnl find if POSIX threads are available
+ dnl AIX calls the library libpthreads - thanks IBM!
+ if test "$wxUSE_AIX" = 1; then
+ THREADS_LIB=pthreads
+ else
+ THREADS_LIB=pthread
+ fi
+
dnl standard lib name is pthread
dnl We no longer test for pthread-0.7 as it breaks compilation on some
dnl glibc2 systems, especially for static linkage.
- AC_CHECK_LIB(pthread, pthread_create, [
+ AC_CHECK_LIB($THREADS_LIB, pthread_create, [
THREADS_OBJ="threadpsx.lo"
- THREADS_LINK="pthread"
+ THREADS_LINK=$THREADS_LIB
], [
dnl thread functions are in libc_r under FreeBSD
AC_CHECK_LIB(c_r, pthread_create, [
)]
)
- dnl VZ: we should be checking for all of the following functions instead:
+ dnl to be able to set the thread priority, we need to have all of the
+ dnl following functions:
dnl 1. pthread_attr_getschedpolicy
dnl 2. sched_get_priority_min and sched_get_priority_max
+ dnl (this one can be in either libpthread or libposix4 (under Solaris))
dnl 3. pthread_attr_getschedparam and pthread_attr_setschedparam
- dnl but it seems that if the first one is there, the other ones are too (of
- dnl course the proper solution would be to implement AC_FUNC_THREAD above
- dnl and do test for them all - anyone?)
+ HAVE_PRIOR_FUNCS=0
AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
- AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS),
- [AC_CHECK_LIB("posix4", pthread_attr_getschedpolicy,
- [AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS) POSIX4_LINK="-lposix4"],
- AC_MSG_WARN(Setting thread priority will not work)
- )]
+ AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
+ AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
+ HAVE_PRIOR_FUNCS=1,
+ AC_CHECK_LIB("posix4", sched_get_priority_max,
+ [
+ HAVE_PRIOR_FUNCS=1
+ POSIX4_LINK="-lposix4"
+ ],
+ )
+ )
+ )
)
+ if test "$HAVE_PRIOR_FUNCS" = 1; then
+ AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
+ else
+ AC_MSG_WARN(Setting thread priority will not work)
+ fi
+
AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
AC_DEFINE(HAVE_PTHREAD_CANCEL),
AC_MSG_WARN([wxThread::Kill() will not work properly]))
fi
fi
-if test "$WXGTK13" = 1 ; then
- AC_DEFINE_UNQUOTED(__WXGTK13__,$WXGTK13)
+if test "$WXGTK20" = 1 ; then
+ AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK20)
WXGTK12=1
fi
AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
fi
+if test "$WXGTK127" = 1 ; then
+ AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127)
+fi
+
if test "$WXWINE" = 1 ; then
TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
fi
AC_DEFINE(wxUSE_OPENGL)
AC_DEFINE(wxUSE_GLCANVAS)
AC_CHECK_LIB(GL, glFlush, [
- OPENGL_LINK="-lGL"
+ OPENGL_LINK="-lGL -lGLU"
],[
AC_CHECK_LIB(MesaGL, glFlush, [
- OPENGL_LINK="-lMesaGL"
+ OPENGL_LINK="-lMesaGL -lMesaGLU"
],)
],)
],wxUSE_OPENGL=0)
AC_DEFINE(wxUSE_ZIPSTREAM)
fi
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+ AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
+fi
+
if test "$wxUSE_BUSYINFO" = "yes"; then
AC_DEFINE(wxUSE_BUSYINFO)
fi
else
AC_DEFINE(wxUSE_INTL)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
+ GUIDIST="$GUIDIST INTL_DIST"
fi
fi
dnl Joystick support
dnl ---------------------------------------------------------------------------
+if test "$wxUSE_GUI" = "yes"; then
+
dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then
-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then
dnl joystick support is only for Linux 2.1.x or greater
AC_CHECK_HEADERS(linux/joystick.h)
if test "$ac_cv_header_linux_joystick_h" != "yes"; then
- wxUSE_JOYSTICK=0
- AC_MSG_WARN(Joystick not supported yb this system, disabled)
+ wxUSE_JOYSTICK=no
+ AC_MSG_WARN(Joystick not supported by this system, disabled)
fi
fi
fi
dnl if !MSW
-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then
AC_DEFINE(wxUSE_JOYSTICK)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
fi
+fi
+dnl if wxUSE_GUI
+
dnl ------------------------------------------------------------------------
dnl DLL support
dnl ------------------------------------------------------------------------
[
AC_DEFINE(HAVE_SHL_LOAD)
HAVE_SHL_FUNCS=1
+ ],
+ [
+ AC_CHECK_LIB(shl_load, dld,
+ [
+ HAVE_SHL_FUNCS=1
+ LIBS="$LIBS -ldld"
+ ])
])
])
])
+ dnl check also for dlerror()
+ if test "$HAVE_DL_FUNCS" = 1; then
+ AC_CHECK_FUNCS(dlerror,
+ AC_DEFINE(HAVE_DLERROR),
+ AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
+ fi
+
if test "$HAVE_DL_FUNCS" = 0; then
if test "$HAVE_SHL_FUNCS" = 0; then
if test "$USE_UNIX" = 1; then
dnl ---------------------------------------------------------------------------
if test "$wxUSE_IPC" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
+ fi
+
AC_DEFINE(wxUSE_IPC)
fi
dnl get the string with OS info - used by wxGetOsDescription()
dnl ---------------------------------------------------------------------------
-OSINFO=`uname -s -r -m`
-OSINFO="\"$OSINFO\""
+if test "$cross_compiling" = "yes"; then
+ dnl Use best guess from host as we can't use uname when cross compiling
+ OSINFO="\"$host\""
+else
+ dnl attualy work out OS version
+ OSINFO=`uname -s -r -m`
+ OSINFO="\"$OSINFO\""
+fi
+
AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------
-GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $TOOLKIT_LINK"
+GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
+OPENGL_LIBS="$OPENGL_LINK"
dnl all additional libraries (except wxWindows itself) we link with
-EXTRA_LIBS="$LIBS $ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+dnl
+dnl note that we always link with -lm - extended.c uses floor() and is always
+dnl linked in
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
if test "$wxUSE_GUI" = "yes"; then
- EXTRA_LIBS="$EXTRA_LIBS $GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK"
+ EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $EXTRA_LIBS"
fi
dnl all the libraries needed to link wxWindows programs when using the
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
dnl all -I options we must pass to the compiler
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include -I\${top_srcdir}/contrib/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
+
+dnl wxGTK does not need TOOLKIT includes in wx-config
+if test "$wxUSE_GTK" = 1; then
+ WXCONFIG_INCLUDE=""
+else
+ WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
+fi
dnl C/C++ compiler options used to compile wxWindows
if test "$GXX" = yes ; then
fi
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
-CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
LDFLAGS="$LDFLAGS $PROFILE"
AC_SUBST(CODE_GEN_FLAGS)
AC_SUBST(BURNT_LIBRARY_NAME)
AC_SUBST(BURNT_LIBRARY_NAME_GL)
+AC_SUBST(WX_TARGET_LIBRARY_SONAME)
+AC_SUBST(WX_TARGET_LIBRARY_TYPE)
dnl debugging options
AC_SUBST(WXDEBUG_DEFINE)
AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DEF)
AC_SUBST(TOOLKIT_DIR)
+AC_SUBST(TOOLKIT_NAME)
AC_SUBST(TOOLKIT_INCLUDE)
+AC_SUBST(WXCONFIG_INCLUDE)
dnl what to compile
AC_SUBST(GUIHEADERS)
dnl additional libraries and linker settings
AC_SUBST(LDFLAGS)
AC_SUBST(EXTRA_LIBS)
+AC_SUBST(OPENGL_LIBS)
AC_SUBST(EXTRADEFS)
AC_SUBST(LIBS)
AC_SUBST(LD_LIBS)
+dnl additional resurces settings
+AC_SUBST(RCINPUTSWITCH)
+AC_SUBST(RCOUTPUTSWITCH)
+AC_SUBST(RESPROGRAM)
+AC_SUBST(RESCOMP)
+AC_SUBST(RESFLAGS)
+
+dnl These seam to be missing
+AC_SUBST(DLLTOOL)
+AC_SUBST(AS)
+AC_SUBST(NM)
+AC_SUBST(LD)
+AC_SUBST(MAKEINFO)
+
+
dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
dnl - and we do use it)
wx_cv_path_ifs=$PATH_IFS
wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY
+ wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
AC_CONFIG_SUBDIRS(demos samples utils contrib)
fi
dnl from wxUSE_GUI
],
[
chmod +x wx-config
- mv wx-config wx${TOOLKIT_DIR}-config
- ${LN_S} wx${TOOLKIT_DIR}-config wx-config
+ mv wx-config wx${TOOLKIT_NAME}-config
+ ${LN_S} wx${TOOLKIT_NAME}-config wx-config
- dnl the debian installer wants setup.h to be in the lib subdir
- dnl so we *copy* it there
+ dnl the debian build process wants setup.h in the lib subdir so we
+ dnl can pretend wxWin is already installed, so we *copy* it there
if test ! -d lib; then
mkdir lib
if test ! -d lib/wx/include/wx; then
mkdir lib/wx/include/wx
fi
- if test ! -d lib/wx/include/wx/${TOOLKIT_DIR}; then
- mkdir lib/wx/include/wx/${TOOLKIT_DIR}
+ if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then
+ mkdir lib/wx/include/wx/${TOOLKIT_NAME}
fi
if test -f setup.h; then
- cp -f setup.h lib/wx/include/wx/${TOOLKIT_DIR}/setup.h
+ cp -f setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
fi
dnl *move* setup.h to its final place
],
[
TOOLKIT_DIR="${TOOLKIT_DIR}"
+ TOOLKIT_NAME="${TOOLKIT_NAME}"
LN_S="${LN_S}"
]
)
projects / wxWidgets.git / blobdiff