USE_SOLARIS=
USE_SUNOS=
USE_ALPHA=
-USE_IA64=
USE_OSF=
USE_BSD=
USE_DARWIN=
USE_ALPHA=1
AC_DEFINE(__ALPHA__)
fi
- if test "x$TMP" = "xia64"; then
- USE_IA64=1
- AC_DEFINE(__IA64__)
- fi
DEFAULT_DEFAULT_wxUSE_GTK=1
;;
*-*-irix5* | *-*-irix6* )
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=no
DEFAULT_wxUSE_LOGGUI=no
+ DEFAULT_wxUSE_LOGDIALOG=no
DEFAULT_wxUSE_GUI=yes
DEFAULT_wxUSE_CONTROLS=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_TIPWINDOW=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=yes
DEFAULT_wxUSE_LOGGUI=yes
+ DEFAULT_wxUSE_LOGDIALOG=yes
DEFAULT_wxUSE_GUI=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
+ DEFAULT_wxUSE_TIPWINDOW=yes
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
fi
dnl for GUI only
-WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
+WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
WX_ARG_SYS_WITH(regex, [ --with-regex enable support for wxRegEx class], wxUSE_REGEX)
WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
-WX_ARG_ENABLE(mimetype, [ --enable-mimetypes use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE)
WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
WX_ARG_ENABLE(loggui, [ --enable-loggui use standard GUI logger], wxUSE_LOGGUI)
WX_ARG_ENABLE(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LOGWINDOW)
+WX_ARG_ENABLE(logdialog, [ --enable-logdialog use wxLogDialog], wxUSE_LOGDIALOG)
dnl ---------------------------------------------------------------------------
dnl PostScript options
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
+ DEFAULT_wxUSE_TIPWINDOW=yes
elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_BMPBUTTON=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_TIPWINDOW=no
fi
WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL)
WX_ARG_ENABLE(tbarnative, [ --enable-tbarnative use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
WX_ARG_ENABLE(tbarsmpl, [ --enable-tbarsmpl use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
WX_ARG_ENABLE(treectrl, [ --enable-treectrl use wxTreeCtrl class], wxUSE_TREECTRL)
+WX_ARG_ENABLE(tipwindow, [ --enable-tipwindow use wxTipWindow class], wxUSE_TIPWINDOW)
WX_ARG_ENABLE(popupwin, [ --enable-popupwin use wxPopUpWindow class], wxUSE_POPUPWIN)
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(choicedlg, [ --enable-choicedlg use wxChoiceDialog], wxUSE_CHOICEDLG)
WX_ARG_ENABLE(coldlg, [ --enable-coldlg use wxColourDialog], wxUSE_COLOURDLG)
WX_ARG_ENABLE(filedlg, [ --enable-filedlg use wxFileDialog], wxUSE_FILEDLG)
-WX_ARG_ENABLE(filedlg, [ --enable-finddlg use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
+WX_ARG_ENABLE(finddlg, [ --enable-finddlg use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
WX_ARG_ENABLE(fontdlg, [ --enable-fontdlg use wxFontDialog], wxUSE_FONTDLG)
WX_ARG_ENABLE(dirdlg, [ --enable-dirdlg use wxDirDialog], wxUSE_DIRDLG)
WX_ARG_ENABLE(msgdlg, [ --enable-msgdlg use wxMessageDialog], wxUSE_MSGDLG)
WX_ARG_ENABLE(gif, [ --enable-gif use gif images (GIF file format)], wxUSE_GIF)
WX_ARG_ENABLE(pcx, [ --enable-pcx use pcx images (PCX file format)], wxUSE_PCX)
WX_ARG_ENABLE(pnm, [ --enable-pnm use pnm images (PNM file format)], wxUSE_PNM)
-WX_ARG_ENABLE(pnm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_ENABLE(xpm, [ --enable-xpm use xpm images (XPM file format)], wxUSE_XPM)
fi
dnl for GUI only
dnl define which libs wx-config should link.
WXCONFIG_LIBS="-l${WX_LIBRARY}"
+WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
if test "$wxUSE_OPENGL" = "yes"; then
- WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
+ WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
+ WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
fi
;;
*-*-darwin* )
- CFLAGS="$CFLAGS -fno-common"
- CXXFLAGS="$CXXFLAGS -fno-common"
- SHARED_LD="$CXX -dynamiclib -o"
+ CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+ CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+ SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
PIC_FLAG="-dynamic -fPIC"
;;
dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
WX_TARGET_LIBRARY_TYPE="so"
+ INSTALL_LIBRARY='$(INSTALL_PROGRAM)'
fi
dnl do not 'else' this, it may be changed in the above conditional.
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
WX_TARGET_LIBRARY_TYPE="a"
+ INSTALL_LIBRARY='$(INSTALL_DATA)'
fi
if test "$wxUSE_MAC" = 1; then
WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
- AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+ AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
dnl defines HAVE_STDLIB_H
AC_CHECK_HEADERS(stdlib.h)
+dnl defines HAVE_MALLOC_H
+AC_CHECK_HEADERS(malloc.h)
dnl defines HAVE_UNISTD_H
AC_CHECK_HEADERS(unistd.h)
dnl defines HAVE_WCHAR_H
AC_CHECK_HEADERS(wchar.h)
dnl defines HAVE_WCSTR_H
AC_CHECK_HEADERS(wcstr.h)
+dnl defined HAVE_WCTYPE_H
+AC_CHECK_HEADERS(wctype.h)
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
dnl check for wchar_t
dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
+dnl on Cygwin wchar.h needs stddef.h to be #included by hand
AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
[
AC_TRY_COMPILE(
[
#ifdef HAVE_WCHAR_H
+ # ifdef __CYGWIN__
+ # include <stddef.h>
+ # endif
# include <wchar.h>
#endif
#ifdef HAVE_STDLIB_H
AC_TRY_RUN(
[
#ifdef HAVE_WCHAR_H
+ # ifdef __CYGWIN__
+ # include <stddef.h>
+ # endif
# include <wchar.h>
#endif
#ifdef HAVE_STDLIB_H
dnl check for vfork() (even if it's the same as fork() in modern Unices)
AC_CHECK_FUNCS(vfork)
+dnl check for the function for temp files creation
+AC_CHECK_FUNCS(mkstemp mktemp, break)
+
dnl get the library function to use for wxGetDiskSpace(): it is statfs() under
dnl Linux and *BSD and statvfs() under Solaris
AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then
- AC_MSG_WARN([Threads are not supported under WINE])
+ AC_MSG_WARN([Threads are not supported under WINE... disabled])
wxUSE_THREADS="no"
elif test "$USE_BEOS" = 1; then
- AC_MSG_WARN([BeOS threads are not yet supported])
+ AC_MSG_WARN([BeOS threads are not yet supported... disabled])
wxUSE_THREADS="no"
fi
fi
if test -z "$THREADS_OBJ" ; then
wxUSE_THREADS=no
- AC_MSG_WARN(No thread support on this system)
+ AC_MSG_WARN([No thread support on this system... disabled])
fi
fi
if test "$wxUSE_TEXTFILE" = "yes"; then
if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
- AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them)
+ AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer... disabled)
else
AC_DEFINE(wxUSE_TEXTFILE)
fi
if test "$wxUSE_CONFIG" = "yes" ; then
if test "$wxUSE_TEXTFILE" != "yes"; then
- AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it)
+ AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
else
AC_DEFINE(wxUSE_CONFIG)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
if test "$wxUSE_INTL" = "yes" ; then
if test "$wxUSE_FILE" != "yes"; then
- AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it)
+ AC_MSG_WARN(I18n code requires wxFile... disabled)
else
AC_DEFINE(wxUSE_INTL)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
if test "$wxUSE_LOGWINDOW" = "yes"; then
AC_DEFINE(wxUSE_LOGWINDOW)
fi
+
+ if test "$wxUSE_LOGDIALOG" = "yes"; then
+ AC_DEFINE(wxUSE_LOG_DIALOG)
+ fi
fi
if test "$wxUSE_LONGLONG" = "yes"; then
if test "$wxUSE_GUI" = "yes"; then
+ if test "$TOOLKIT" = "MAC"; then
+ AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
+ wxUSE_JOYSTICK=no
+ fi
+ if test "$TOOLKIT" = "MOTIF"; then
+ AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
+ wxUSE_JOYSTICK=no
+ fi
+
dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then
AC_CHECK_HEADERS(linux/joystick.h)
if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no
- AC_MSG_WARN(Joystick not supported by this system, disabled)
+ AC_MSG_WARN(Joystick not supported by this system... disabled)
fi
fi
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_UNIVERSAL" = "yes"; then
- AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled)
+ AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
wxUSE_MDI_ARCHITECTURE=no
fi
if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
- AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
+ AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
fi
AC_DEFINE(wxUSE_IPC)
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then
- AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
+ AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_MOTIF" = 1; then
- AC_MSG_WARN([Drag and drop is not yet supported under Motif])
+ AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
wxUSE_DRAG_AND_DROP=no
fi
if test "$wxUSE_MAC" = 1; then
- AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X])
+ AC_MSG_WARN([Drag and drop not yet supported under Mac OS X... disabled])
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
- AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
+ if test "$wxUSE_MAC" = 1; then
+ AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
+ wxUSE_TOGGLEBTN=no
+ fi
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then
- AC_MSG_WARN(wxTooltip not supported yet under Motif)
+ AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
else
if test "$wxUSE_WINE" = 1; then
- AC_MSG_WARN(wxTooltip not supported under WINE)
+ AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
else
- AC_DEFINE(wxUSE_TOOLTIPS)
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
+ else
+ AC_DEFINE(wxUSE_TOOLTIPS)
+ fi
fi
fi
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1; then
- AC_MSG_WARN(Popup window is not yet supported under Mac OS)
+ AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
else
- AC_DEFINE(wxUSE_POPUPWIN)
- USES_CONTROLS=1
+ if test "$wxUSE_MOTIF" = 1; then
+ AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+ else
+ AC_DEFINE(wxUSE_POPUPWIN)
+
+ USES_CONTROLS=1
+ fi
fi
fi
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+ AC_DEFINE(wxUSE_TIPWINDOW)
+fi
+
if test "$USES_CONTROLS" = 1; then
AC_DEFINE(wxUSE_CONTROLS)
fi
AC_SUBST(cross_compiling)
AC_SUBST(WXCONFIG_LIBS)
AC_SUBST(WXCONFIG_LIBS_GL)
+AC_SUBST(WXCONFIG_LIBS_STATIC)
+AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
AC_SUBST(WXCONFIG_INCLUDE)
dnl what to compile
AC_SUBST(NM)
AC_SUBST(LD)
AC_SUBST(MAKEINFO)
-
+AC_SUBST(INSTALL_LIBRARY)
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 itself (this macro is required if SUBDIRS variable is used in Makefile.am
dnl - and we do use it)
AC_PROG_MAKE_SET
projects / wxWidgets.git / blobdiff