if (gtk_minor_version == 1) return FALSE;
return !((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
fi
])
-dnl ---------------------------------------------------------------------------
-dnl WX_CPP_SIZE_T_IS_NOT_INT checks whether size_t and int are different types,
-dnl i.e. whether we may overload operator[] on its argument type
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN(WX_CPP_SIZE_T_IS_NOT_INT,
-[
- AC_CACHE_CHECK([if size_t and int are different types], wx_cv_cpp_sizet_not_int,
- [
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- AC_TRY_RUN([
- #include <stdlib.h>
-
- class S
- {
- public:
- S(char *s) { m_s = s; }
-
- char operator[](size_t n) const { return m_s[n]; }
- char operator[](int n) const { return m_s[n]; }
-
- private:
- char *m_s;
- };
-
- int main()
- {
- S s("dummy");
- size_t n1 = 2;
- int n2 = 3;
-
- return s[n1] == s[n2];
- }
- ],
- AC_DEFINE(wxUSE_SIZE_T_STRING_OPERATOR) wx_cv_cpp_sizet_not_int=yes,
- wx_cv_cpp_sizet_not_int=no,
- wx_cv_cpp_sizet_not_int=no
- )
-
- AC_LANG_RESTORE
- ])
-])
-
dnl ---------------------------------------------------------------------------
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
dnl ---------------------------------------------------------------------------
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=11
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0
dnl assume Unix
USE_UNIX=1
+USE_WIN32=0
USE_LINUX=
USE_SGI=
USE_HPUX=
USE_MINGW=
USE_DATA_GENERAL=
+dnl on some platforms xxx_r() functions are declared inside "#ifdef
+dnl _REENTRANT" and it's easier to just define this symbol for these platforms
+dnl than checking it during run-time
+NEEDS_D_REENTRANT_FOR_R_FUNCS=0
+
dnl the list of all available toolkits
ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE"
*-hp-hpux* )
USE_HPUX=1
DEFAULT_DEFAULT_wxUSE_MOTIF=1
+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1
AC_DEFINE(__HPUX__)
;;
*-*-linux* )
AC_DEFINE(__SOLARIS__)
AC_DEFINE(__SVR4__)
DEFAULT_DEFAULT_wxUSE_MOTIF=1
+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1
;;
*-*-sunos4* )
USE_SUN=1
*-*-cygwin32* )
USE_UNIX=0
+ USE_WIN32=1
AC_DEFINE(__WIN32__)
AC_DEFINE(__WIN95__)
AC_DEFINE(__WINDOWS__)
AC_DEFINE(__GNUWIN32__)
+ AC_DEFINE(STRICT)
AC_DEFINE(WINVER, 0x0400)
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
*-*-mingw32* )
USE_UNIX=0
+ USE_WIN32=1
AC_DEFINE(__WIN32__)
AC_DEFINE(__WIN95__)
AC_DEFINE(__WINDOWS__)
AC_DEFINE(__GNUWIN32__)
+ AC_DEFINE(STRICT)
AC_DEFINE(WINVER, 0x0400)
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
+ DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
+ DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
DEFAULT_wxUSE_DEBUG_GDB=yes
DEFAULT_wxUSE_ZLIB=no
DEFAULT_wxUSE_LIBPNG=no
- DEFAULT_wxUSE_LIBGIF=no
DEFAULT_wxUSE_LIBJPEG=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_CONFIG=no
DEFAULT_wxUSE_STREAMS=no
DEFAULT_wxUSE_SOCKETS=no
+ DEFAULT_wxUSE_DIALUP_MANAGER=no
DEFAULT_wxUSE_SERIAL=no
DEFAULT_wxUSE_JOYSTICK=no
DEFAULT_wxUSE_DYNLIB_CLASS=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
+
+ DEFAULT_wxUSE_GIF=no
+ DEFAULT_wxUSE_PCX=no
+ DEFAULT_wxUSE_PNM=no
else
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
+ DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
+ DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_DEBUG_INFO=no
DEFAULT_wxUSE_DEBUG_GDB=no
DEFAULT_wxUSE_ZLIB=yes
DEFAULT_wxUSE_LIBPNG=yes
- DEFAULT_wxUSE_LIBGIF=yes
DEFAULT_wxUSE_LIBJPEG=yes
- DEFAULT_wxUSE_ODBC=no
+ DEFAULT_wxUSE_ODBC=yes
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_CONFIG=yes
DEFAULT_wxUSE_STREAMS=yes
DEFAULT_wxUSE_SOCKETS=yes
+ DEFAULT_wxUSE_DIALUP_MANAGER=yes
DEFAULT_wxUSE_SERIAL=yes
DEFAULT_wxUSE_JOYSTICK=yes
DEFAULT_wxUSE_DYNLIB_CLASS=yes
DEFAULT_wxUSE_COMBOBOX=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
+ DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
+
+ DEFAULT_wxUSE_GIF=yes
+ DEFAULT_wxUSE_PCX=yes
+ DEFAULT_wxUSE_PNM=yes
fi
dnl WX_ARG_WITH should be used to select whether an external package will be
fi
done
+dnl ---------------------------------------------------------------------------
+dnl --disable-gui will build only non-GUI part of wxWindows: check for this
+dnl first to disable many other switches if it's given
+dnl
+dnl NB: this is still in testing stage, don't use if you don't know what you're
+dnl doing
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
+
+dnl disable everything GUI related then
+if test "$wxUSE_GUI" = "no"; then
+ DEFAULT_wxUSE_ZLIB=no
+ DEFAULT_wxUSE_LIBPNG=no
+ DEFAULT_wxUSE_LIBJPEG=no
+ DEFAULT_wxUSE_SOCKETS=no
+ DEFAULT_wxUSE_JOYSTICK=no
+ DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
+ DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
+ DEFAULT_wxUSE_POSTSCRIPT=no
+ DEFAULT_wxUSE_X_RESOURCES=no
+ DEFAULT_wxUSE_CLIPBOARD=no
+ DEFAULT_wxUSE_TOOLTIPS=no
+ DEFAULT_wxUSE_DRAG_AND_DROP=no
+ DEFAULT_wxUSE_SPLINES=no
+ DEFAULT_wxUSE_MDI_ARCHITECTURE=no
+ DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
+ DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
+ DEFAULT_wxUSE_PROLOGIO=no
+ DEFAULT_wxUSE_RESOURCES=no
+ DEFAULT_wxUSE_CONSTRAINTS=no
+ DEFAULT_wxUSE_IPC=no
+ DEFAULT_wxUSE_HELP=no
+ DEFAULT_wxUSE_WXTREE=no
+ DEFAULT_wxUSE_METAFILE=no
+ DEFAULT_wxUSE_COMMONDLGS=no
+ DEFAULT_wxUSE_DIRDLG=no
+ DEFAULT_wxUSE_TEXTDLG=no
+ DEFAULT_wxUSE_STARTUP_TIPS=no
+ DEFAULT_wxUSE_PROGRESSDLG=no
+ DEFAULT_wxUSE_MINIFRAME=no
+ DEFAULT_wxUSE_HTML=no
+ DEFAULT_wxUSE_FS_INET=no
+ DEFAULT_wxUSE_FS_ZIP=no
+ DEFAULT_wxUSE_BUSYINFO=no
+ DEFAULT_wxUSE_ZIPSTREAM=no
+ DEFAULT_wxUSE_VALIDATORS=no
+ DEFAULT_wxUSE_ACCEL=no
+ DEFAULT_wxUSE_CARET=no
+ DEFAULT_wxUSE_BMPBUTTON=no
+ DEFAULT_wxUSE_CHECKBOX=no
+ DEFAULT_wxUSE_CHECKLST=no
+ DEFAULT_wxUSE_CHOICE=no
+ DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_GAUGE=no
+ DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_NEW_GRID=no
+ DEFAULT_wxUSE_IMAGLIST=no
+ DEFAULT_wxUSE_LISTBOX=no
+ DEFAULT_wxUSE_LISTCTRL=no
+ DEFAULT_wxUSE_NOTEBOOK=no
+ DEFAULT_wxUSE_RADIOBOX=no
+ DEFAULT_wxUSE_RADIOBTN=no
+ DEFAULT_wxUSE_SASH=no
+ DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SLIDER=no
+ DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPLITTER=no
+ DEFAULT_wxUSE_STATBMP=no
+ DEFAULT_wxUSE_STATBOX=no
+ DEFAULT_wxUSE_STATLINE=no
+ DEFAULT_wxUSE_STATUSBAR=no
+ DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TOOLBAR=no
+ DEFAULT_wxUSE_TREECTRL=no
+ DEFAULT_wxUSE_GIF=no
+ DEFAULT_wxUSE_PCX=no
+ DEFAULT_wxUSE_PNM=no
+fi
+
AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(wine, [ --with-wine use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 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)
WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE)
WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI)
WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without exceptions information], wxUSE_NO_EXCEPTIONS)
-
-dnl ---------------------------------------------------------------------------
-dnl --disable-gui will build only non-GUI part of wxWindows
-dnl
-dnl NB: this is still in testing stage, don't use if you don't know what you're
-dnl doing
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
+WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
+WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
dnl ---------------------------------------------------------------------------
dnl (small) optional non GUI classes
WX_ARG_ENABLE(intl, [ --enable-intl use internationalization system], wxUSE_INTL)
WX_ARG_ENABLE(config, [ --enable-config use wxConfig (and derived) classes], wxUSE_CONFIG)
WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS)
+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(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)
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
+ DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox classes], wxUSE_COMBOBOX)
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
+WX_ARG_ENABLE(newgrid, [ --enable-newgrid use new wxGrid class], wxUSE_NEW_GRID)
WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST)
WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX)
WX_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL)
WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO)
+dnl ---------------------------------------------------------------------------
+dnl support for image formats that do not rely on external library
+dnl ---------------------------------------------------------------------------
+
+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)
+
dnl cache the options values before (may be) aborting below
WX_ARG_CACHE_FLUSH
AC_MSG_CHECKING(for toolkit)
+if test "$wxUSE_GUI" = "yes"; then
+
if test "$TOOLKIT_GIVEN" = 1; then
dnl convert "yes" to 1 and "no" to 0
for toolkit in `echo $ALL_TOOLKITS`; do
fi
done
+dnl from "if wxUSE_GUI"
+else
+ AC_MSG_RESULT(base only)
+fi
+
dnl ---------------------------------------------------------------------------
dnl Checks for programs
dnl ---------------------------------------------------------------------------
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
- CC=$host_alias-gcc
- CXX=$host_alias-c++
+ CC=$host_alias-gcc
+ CXX=$host_alias-c++
AR=$host_alias-ar
RANLIB=$host_alias-ranlib
- DLLTOOL=$host_alias-dlltool
- LD=$host_alias-ld
+ DLLTOOL=$host_alias-dlltool
+ LD=$host_alias-ld
NM=$host_alias-nm
STRIP=$host_alias-strip
fi
dnl looked for in all directories of this path
dnl ---------------------------------------------------------------------------
+dnl notice that /usr/include should not be in this list, otherwise it breaks
+dnl compilation on Solaris/gcc because standard headers are included instead
+dnl of the gcc ones (correction: it *is* needed for broken AIX compiler - but
+dnl do put it last!)
+dnl
+dnl Also try to put all directories which may contain X11R6 before those which
+dnl may contain X11R5/4 - we want to use R6 on machines which have both!
SEARCH_INCLUDE="\
+ /usr/local/include \
+ \
/usr/Motif-1.2/include \
/usr/Motif-2.1/include \
\
/usr/include/Motif1.2 \
/opt/xpm/include/X11 \
+ /opt/GBxpm/include/ \
+ /opt/GBxpm/X11/include/ \
\
/usr/Motif1.2/include \
/usr/dt/include \
+ /usr/openwin/include \
+ \
/usr/include/Xm \
\
/usr/X11R6/include \
+ /usr/X11R6.4/include \
/usr/X11R5/include \
/usr/X11R4/include \
\
- /usr/X11R6/lib \
- /usr/X11R5/lib \
- /usr/X11R4/lib \
- \
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
/usr/x386/include \
/usr/XFree86/include/X11 \
\
- /usr/include \
- /usr/local/include \
- \
/usr/include/gtk \
/usr/local/include/gtk \
/usr/include/glib \
/usr/local/x11r5/include \
/usr/lpp/Xamples/include \
\
- /usr/openwin/include \
/usr/openwin/share/include \
- "
+ \
+ /usr/include"
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
dnl search for toolkit (widget sets)
dnl ----------------------------------------------------------------
+if test "$wxUSE_GUI" = "yes"; then
+
TOOLKIT=
TOOLKIT_INCLUDE=
WXWINE=
+dnl Extension for programs; '.exe' for msw builds
+PROGRAM_EXT=
+
if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
- AC_MSG_CHECKING(for Windows headers)
- WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
+ if test "$cross_compiling" = "yes" ; then
+ AC_MSG_WARN(Cross compiling --- skipping windows.h check)
+ else
+ AC_MSG_CHECKING(for Windows headers)
+ WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
+ if test "$ac_find_includes" != "" ; then
+ AC_MSG_RESULT(found $ac_find_includes)
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
+ fi
+ fi
+
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-
dnl --- Quick & Dirty ; link against most/all libraries
dnl --- This will bloat the executable, but it'll work for now...
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
- if test "$ac_find_includes" != "" ; then
- AC_MSG_RESULT(found $ac_find_includes)
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
- else
- AC_MSG_RESULT(no)
- if test "$cross_compiling" != "yes" ; then
- AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
- fi
+ dnl -mwindows is needed to avoid that spawning of a console window
+ if test "$wxUSE_MINGW" = 1; then
+ LDFLAGS="$LDFLAGS -mwindows"
fi
TOOLKIT=MSW
-
- GUIOBJS=MSW_GUIOBJS
- GUIHEADERS=MSW_HEADERS
- COMMONOBJS=MSW_COMMONOBJS
- GENERICOBJS=MSW_GENERICOBJS
+
+ GUIOBJS="\$(MSW_GUIOBJS)"
+ GUIHEADERS="\$(MSW_HEADERS)"
+ COMMONOBJS="\$(MSW_COMMONOBJS)"
+ GENERICOBJS="\$(MSW_GENERICOBJS)"
UNIXOBJS=
GUIDIST=MSW_DIST
+ PROGRAM_EXT=.exe
fi
if test "$wxUSE_GTK" = 1; then
dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
dnl only then, if it wasn't found, for an older one
- AM_PATH_GTK(1.2.0, WXGTK12=1)
- if test "$WXGTK12" != 1; then
- AM_PATH_GTK(1.0.0, , AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?))
- fi
+ AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
TOOLKIT_INCLUDE="$GTK_CFLAGS"
- GUI_TK_LIBRARY="$GTK_LIBS -ldl"
+ GUI_TK_LIBRARY="$GTK_LIBS"
TOOLKIT=GTK
-
- GUIOBJS=GTK_GUIOBJS
- GUIHEADERS=GTK_HEADERS
- COMMONOBJS=GTK_COMMONOBJS
- GENERICOBJS=GTK_GENERICOBJS
- UNIXOBJS=UNIXOBJS
+
+ GUIOBJS="\$(GTK_GUIOBJS)"
+ GUIHEADERS="\$(GTK_HEADERS)"
+ COMMONOBJS="\$(GTK_COMMONOBJS)"
+ GENERICOBJS="\$(GTK_GENERICOBJS)"
+ GUIDEPS="\$(GTK_GUIDEPS)"
+ COMMONDEPS="\$(GTK_COMMONDEPS)"
+ GENERICDEPS="\$(GTK_GENERICDEPS)"
+ UNIXOBJS="\$(UNIX_OBJS)"
GUIDIST=GTK_DIST
fi
AC_MSG_RESULT(no)
AC_MSG_WARN(library will be compiled without support for images in XPM format)
fi
-
+
MESA_LINK=""
AC_MSG_CHECKING(for Mesa library)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
AC_MSG_ERROR(no)
fi
- GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -ldl -lm"
+ GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -lm"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
WXWINE=1
TOOLKIT=MSW
-
- GUIOBJS=MSW_GUIOBJS
- GUIHEADERS=MSW_HEADERS
- COMMONOBJS=MSW_COMMONOBJS
- GENERICOBJS=MSW_GENERICOBJS
- UNIXOBJS=UNIXOBJS
+
+ GUIHEADERS="\$(MSW_HEADERS)"
+ GUIOBJS="\$(MSW_GUIOBJS)"
+ COMMONOBJS="\$(MSW_COMMONOBJS)"
+ GENERICOBJS="\$(MSW_GENERICOBJS)"
+ GUIDEPS="\$(MSW_GUIDEPS)"
+ COMMONDEPS="\$(MSW_COMMONDEPS)"
+ GENERICDEPS="\$(MSW_GENERICDEPS)"
+ UNIXOBJS="\$(UNIX_OBJS)"
GUIDIST=MSW_DIST
fi
if test "$wxUSE_MOTIF" = 1; then
- dnl find the X11 include and library files
- dnl defines x_includes and x_libraries
+ 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
if test "$no_x" = "yes"; then
- AC_MSG_ERROR(X11 libraries not found, aborting)
+ AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
fi
- TOOLKIT_INCLUDE="$X_CFLAGS"
GUI_TK_LIBRARY="$X_LIBS"
+ TOOLKIT_INCLUDE="$X_CFLAGS"
- AC_MSG_CHECKING(for Motif/Lesstif includes)
+ dnl manual check for X11 headers/libs
+ dnl
+ dnl AC_MSG_CHECKING(for X11 headers)
+ dnl WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h)
+ dnl if test "$ac_find_includes" != "" ; then
+ dnl AC_MSG_RESULT(found $ac_find_includes)
+ dnl else
+ dnl AC_MSG_RESULT(no)
+ dnl AC_MSG_ERROR(please set CFLAGS to contain the location of X11/Intrinsic.h)
+ dnl fi
+ dnl
+ dnl AC_MSG_CHECKING(for X11 libraries)
+ dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11)
+ dnl if test "$ac_find_libraries" != "" ; then
+ dnl WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
+ dnl WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
+ dnl
+ dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+ dnl TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+ dnl AC_MSG_RESULT(found at $ac_find_libraries)
+ dnl else
+ dnl AC_MSG_RESULT(no)
+ dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libX11)
+ dnl fi
+
+ AC_MSG_CHECKING(for Motif/Lesstif headers)
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes)
WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
- CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found at $ac_find_libraries)
else
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
- CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
AC_MSG_RESULT(found at $ac_find_libraries)
else
AC_MSG_RESULT(no)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
- CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
XPM_LINK="-lXpm "
AC_DEFINE(wxHAVE_LIB_XPM)
AC_MSG_RESULT(found at $ac_find_libraries)
AC_MSG_WARN(library will be compiled without support for images in XPM format)
fi
- GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm"
+ GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF
-
- GUIOBJS=MOTIF_GUIOBJS
- GUIHEADERS=MOTIF_HEADERS
- COMMONOBJS=MOTIF_COMMONOBJS
- GENERICOBJS=MOTIF_GENERICOBJS
- UNIXOBJS=UNIXOBJS
+
+ GUIHEADERS="\$(MOTIF_HEADERS)"
+ GUIOBJS="\$(MOTIF_GUIOBJS)"
+ COMMONOBJS="\$(MOTIF_COMMONOBJS)"
+ GENERICOBJS="\$(MOTIF_GENERICOBJS)"
+ GUIDEPS="\$(MOTIF_GUIDEPS)"
+ COMMONDEPS="\$(MOTIF_COMMONDEPS)"
+ GENERICDEPS="\$(MOTIF_GENERICDEPS)"
+ UNIXOBJS="\$(UNIX_OBJS)"
GUIDIST=MOTIF_DIST
fi
dnl the name of the (libtool) library
WX_LIBRARY="wx_${TOOLKIT_DIR}"
+ dnl the sources, their dependenices and the headers
+ ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)"
+ ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
+ ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
+else
+ dnl leave all TOOLKIT_XXX vars empty
+
+ dnl the sources, their dependenices and the headers
+ ALL_OBJECTS="\$(BASE_OBJS)"
+ ALL_DEPFILES="\${BASE_DEPS}"
+ ALL_HEADERS="\${BASE_HEADERS}"
+
+ dnl building wxBase only
+ WX_LIBRARY="wxbase"
+fi
+
dnl the name of the (libtool) library
-WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la"
+WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
dnl the name of the static library
-WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
dnl the name of the links to the shared library
-WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so"
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
+WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
dnl shared library settings
SHARED_LD=
PIC_FLAG=
-WX_CREATE_LINKS=
+WX_ALL=
+WX_ALL_INSTALLED=
if test "$wxUSE_SHARED" = "yes"; then
- dnl set target to shared
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
-
-case "${host}" in
- *-hp-hpux* )
- WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
- SHARED_LD="${CXX} -b -o"
- PIC_FLAG="+Z"
- ;;
- *-*-linux* )
- SHARED_LD="${CC} -shared -o"
- PIC_FLAG="-fPIC"
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-irix5* | *-*-irix6* )
- if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -o"
- PIC_FLAG="-fPIC"
- else
- SHARED_LD="${CXX} -shared -o"
- fi
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-solaris2* )
- if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -o"
- PIC_FLAG="-fPIC"
- else
- SHARED_LD="${CXX} -G -o"
- PIC_FLAG="PIC"
+ case "${host}" in
+ *-hp-hpux* )
+ if test "$GCC" = yes ; then
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ else
+ SHARED_LD="${CXX} -b -o"
+ PIC_FLAG="+Z"
+ fi
+ WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
+ WX_ALL=${WX_LIBRARY_NAME_SHARED}
+ ;;
+ *-*-linux* )
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-irix5* | *-*-irix6* )
+ if test "$GCC" = yes ; then
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ else
+ SHARED_LD="${CXX} -shared -o"
+ fi
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-solaris2* )
+ if test "$GCC" = yes ; then
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ else
+ SHARED_LD="${CXX} -G -o"
+ PIC_FLAG="-KPIC"
+ fi
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-sunos4* )
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-freebsd* | *-*-netbsd*)
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-osf* )
+ SHARED_LD="${CXX} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-dgux5* )
+ SHARED_LD="${CXX} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-sysv5* )
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
+ ;;
+ *-*-aix* )
+ SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
+ WX_ALL=${WX_LIBRARY_NAME_SHARED}
+ ;;
+ *-*-cygwin32* )
+ dnl only static for now
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ ;;
+ *-*-mingw32* )
+ dnl only static for now
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ ;;
+ *-pc-os2_emx )
+ ;;
+ *)
+ AC_MSG_ERROR(unknown system type ${host}.)
+ esac
+
+ dnl set target to shared if not explicitly chose static before
+ if test "x$WX_TARGET_LIBRARY" = "x"; then
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
fi
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-sunos4* )
- SHARED_LD="${CC} -shared -o"
- PIC_FLAG="-fPIC"
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-freebsd* | *-*-netbsd*)
- SHARED_LD="${CC} -shared -o"
- PIC_FLAG="-fPIC"
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-osf* )
- SHARED_LD="${CXX} -shared -o"
- PIC_FLAG="-fPIC"
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-dgux5* )
- SHARED_LD="${CXX} -shared -o"
- PIC_FLAG="-fPIC"
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-sysv5* )
- SHARED_LD="${CC} -shared -o"
- PIC_FLAG="-fPIC"
- WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
- WX_CREATE_LINKS="CREATE_LINKS"
- ;;
- *-*-aix* )
- SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
- ;;
- *-*-cygwin32* )
- dnl only static for now
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
- ;;
- *-*-mingw32* )
- dnl only static for now
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
- ;;
- *-pc-os2_emx )
- ;;
- *)
- AC_MSG_ERROR(unknown system type ${host}.)
-esac
-
else
dnl set target to static
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
fi
dnl ------------------------------------------------------------------------
AC_CHECK_HEADERS(wcstr.h)
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
-dnl defines HAVE_X11_XKBLIB_H
-AC_CHECK_HEADERS(X11/XKBlib.h)
+
+if test "$wxUSE_GUI" = "yes"; then
+ dnl defines HAVE_X11_XKBLIB_H
+ AC_CHECK_HEADERS(X11/XKBlib.h)
+fi
dnl ---------------------------------------------------------------------------
dnl Checks for typedefs
dnl check whether C++ compiler supports bool built-in type
WX_CPP_BOOL
-dnl check whether overloading on size_t/int parameter works
-WX_CPP_SIZE_T_IS_NOT_INT
-
dnl check whether we should define _GNU_SOURCE
WX_GNU_EXTENSIONS
AC_LANG_RESTORE
+if test "$USE_UNIX" = 1; then
+
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 inet_addr, inet_aton, ...
-AC_CHECK_FUNCS(inet_addr)
-AC_CHECK_FUNCS(inet_aton)
-AC_CHECK_LIB(resolv, inet_aton)
+dnl check for MT-safe version of strtok
+AC_CHECK_FUNCS(strtok_r)
+
+dnl check for inet_addr and inet_aton (these may live either in libc, or in
+dnl libnsl or libresolv)
+INET_LINK=
+AC_CHECK_FUNCS(inet_addr,
+ AC_DEFINE(HAVE_INET_ADDR),
+ [
+ AC_CHECK_LIB(nsl, inet_addr,
+ INET_LINK="nsl",
+ AC_CHECK_LIB(resolv, inet_addr,
+ INET_LINK="resolv"
+ )
+ )
+ ]
+)
+
+AC_CHECK_FUNCS(inet_aton,
+ AC_DEFINE(HAVE_INET_ATON),
+ [
+ dnl only check it in the same lib
+ AC_CHECK_LIB($INET_LINK, inet_aton, AC_DEFINE(HAVE_INET_ATON))
+ ])
+
+if test "x$INET_LINK" != "x"; then
+ AC_DEFINE(HAVE_INET_ADDR)
+ INET_LINK="-l$INET_LINK"
+fi
+
+fi
+dnl Unix
dnl ===========================================================================
dnl Now we have all the info we need - use it!
if test "$wxUSE_THREADS" = "yes" ; then
dnl find if POSIX threads are available
-
+
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.
CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
+else
+ dnl on some systems, _REENTRANT should bedefined if we want to use any _r()
+ dnl functions - add tests for other functions here as well
+ if test "$ac_cv_func_strtok_r" = "yes"; then
+ AC_MSG_CHECKING(if -D_REENTRANT is needed)
+ if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
+ CFLAGS="${CFLAGS} -D_REENTRANT"
+ CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ fi
fi
if test "$WXGTK12" = 1 ; then
fi
WXDEBUG=
-if test "$wxUSE_DEBUG_GDB" = "yes" ; then
- wxUSE_DEBUG_INFO=yes
- WXDEBUG="-ggdb"
-fi
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
WXDEBUG="-g"
wxUSE_OPTIMISE=no
fi
+if test "$wxUSE_DEBUG_GDB" = "yes" ; then
+ wxUSE_DEBUG_INFO=yes
+ WXDEBUG="-ggdb"
+fi
+
if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
AC_DEFINE(WXDEBUG)
WXDEBUG_DEFINE="-D__WXDEBUG__"
PROFILE="-pg"
fi
+DEP_INFO_FLAGS=
if test "$GCC" = yes ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
- WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+ WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
- WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+ WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+ fi
+ if test "$wxUSE_PERMISSIVE" = "yes" ; then
+ CFLAGS="${CFLAGS} -fpermissive"
+ CXXFLAGS="${CXXFLAGS} -fpermissive"
fi
-dnl CFLAGS="${CFLAGS} -fpermissive"
-dnl CXXFLAGS="${CXXFLAGS} -fpermissive"
-fi
-
-
+ if test "$wxUSE_NO_DEPS" = "no" ; then
+ DEP_INFO_FLAGS="-MMD"
+ fi
+fi
+
+
CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
if test "$wxUSE_OPTIMISE" = "no" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
fi
-if test "$wxUSE_LIBGIF" = "yes" ; then
- AC_DEFINE(wxUSE_LIBGIF)
-fi
-
JPEG_INCLUDE=
if test "$wxUSE_LIBJPEG" = "yes" ; then
AC_DEFINE(wxUSE_LIBJPEG)
AC_DEFINE(wxUSE_APPLE_IEEE)
fi
-if test "$wxUSE_TIMEDATE" = "yes"; then
- AC_DEFINE(wxUSE_TIMEDATE)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
-fi
-
if test "$wxUSE_WAVE" = "yes"; then
AC_DEFINE(wxUSE_WAVE)
fi
AC_DEFINE(wxUSE_LONGLONG)
fi
-if test "$wxUSE_SOCKETS" = "yes" ; then
- if test "$wxUSE_THREADS" = "yes" ; then
- AC_DEFINE(wxUSE_SOCKETS)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
- INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
- else
- AC_MSG_WARN(Socket classes require --with-threads and won't be compiled without it)
- wxUSE_SOCKETS=0
- fi
+if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
+ AC_DEFINE(wxUSE_DIALUP_MANAGER)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
fi
if test "$wxUSE_STREAMS" = "yes" ; then
AC_DEFINE(wxUSE_SERIAL)
fi
+dnl ------------------------------------------------------------------------
+dnl time/date functions
+dnl ------------------------------------------------------------------------
+
+if test "$wxUSE_TIMEDATE" = "yes"; then
+ AC_CHECK_FUNCS(gettimeofday localtime ftime)
+
+ if test "$ac_cv_func_gettimeofday" = "yes"; then
+ AC_CACHE_CHECK([whether gettimeofday takes two arguments],
+ wx_cv_func_gettimeofday_has_2_args,
+ [
+ dnl on some _really_ old systems it takes only 1 argument
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+
+ AC_TRY_COMPILE(
+ [
+ #include <sys/time.h>
+ #include <unistd.h>
+ ],
+ [
+ struct timeval tv;
+ struct timezone tz;
+ gettimeofday(&tv, &tz);
+ ],
+ wx_cv_func_gettimeofday_has_2_args=yes,
+ AC_TRY_COMPILE(
+ [
+ #include <sys/time.h>
+ #include <unistd.h>
+ ],
+ [
+ struct timeval tv;
+ gettimeofday(&tv);
+ ],
+ wx_cv_func_gettimeofday_has_2_args=no,
+ wx_cv_func_gettimeofday_has_2_args=unknown
+ )
+ )
+ AC_LANG_RESTORE
+ ])
+
+ if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+ AC_DEFINE(WX_GETTIMEOFDAY_NO_TZ)
+ fi
+ fi
+
+ AC_DEFINE(wxUSE_TIMEDATE)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
+fi
+
dnl ------------------------------------------------------------------------
dnl wxSocket
dnl ------------------------------------------------------------------------
if test "$wxUSE_SOCKETS" = "yes"; then
+ dnl under Solaris, socket functions live in -lsocket
+ AC_CHECK_FUNC(socket,,
+ AC_CHECK_LIB(socket, socket,
+ INET_LINK="$INET_LINK -lsocket",
+ [
+ AC_MSG_WARN([socket library not found - sockets will be disabled])
+ wxUSE_SOCKETS=no
+ ]
+ )
+ )
+fi
+
+if test "$wxUSE_SOCKETS" = "yes" ; then
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
dnl determine the type of third argument for getsockname
AC_MSG_CHECKING(the type of the third argument of getsockname)
AC_TRY_COMPILE(
[#include <sys/socket.h>],
- [socklen_t len; getsockname(0, NULL, &len);],
+ [socklen_t len; getsockname(0, 0, &len);],
AC_DEFINE(SOCKLEN_T, socklen_t) AC_MSG_RESULT(socklen_t),
AC_TRY_COMPILE(
[#include <sys/socket.h>],
- [size_t len; getsockname(0, NULL, &len);],
+ [size_t len; getsockname(0, 0, &len);],
AC_DEFINE(SOCKLEN_T, size_t) AC_MSG_RESULT(size_t),
AC_TRY_COMPILE(
[#include <sys/socket.h>],
- [int len; getsockname(0, NULL, &len);],
+ [int len; getsockname(0, 0, &len);],
AC_DEFINE(SOCKLEN_T, int) AC_MSG_RESULT(int),
- AC_MSG_RESULT(unknown)
- )
+ AC_MSG_RESULT(unknown)
+ )
)
)
AC_LANG_RESTORE
+
+ AC_DEFINE(wxUSE_SOCKETS)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
fi
dnl ---------------------------------------------------------------------------
HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
dnl the test is a bit complicated because we check for dlopen() both with
- dnl and without -ldl
+ dnl and without -ldl and we also try to find shl_load() if there is no
+ dnl dlopen() on this system
AC_CHECK_FUNCS(dlopen,
- [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
- [AC_CHECK_LIB(dl, dlopen,
- [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
- AC_CHECK_FUNCS( shl_load,
- [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
+ [
+ AC_DEFINE(HAVE_DLOPEN)
+ HAVE_DL_FUNCS=1
+ ],
+ [
+ AC_CHECK_LIB(dl, dlopen,
+ [
+ AC_DEFINE(HAVE_DLOPEN)
+ HAVE_DL_FUNCS=1
+ LIBS="$LIBS -ldl"
+ ],
+ [
+ AC_CHECK_FUNCS(shl_load,
+ [
+ AC_DEFINE(HAVE_SHL_LOAD)
+ HAVE_SHL_FUNCS=1
+ ])
+ ])
+ ])
if test "$HAVE_DL_FUNCS" = 0; then
- if test "$USE_UNIX" = 1; then
- AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
- wxUSE_ODBC=no
- wxUSE_DYNLIB_CLASS=no
- else
- AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
- fi
+ if test "$HAVE_SHL_FUNCS" = 0; then
+ if test "$USE_UNIX" = 1; then
+ AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
+ wxUSE_ODBC=no
+ wxUSE_DYNLIB_CLASS=no
+ else
+ AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
+ fi
+ fi
fi
fi
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = "yes" ; then
- AC_DEFINE(wxUSE_ODBC)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+ AC_DEFINE(wxUSE_ODBC)
+ WXODBCFLAG="-D_IODBC_"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+ IODBCOBJS="\$(IODBC_OBJS)"
+else
+ IODBCOBJS=
fi
dnl ----------------------------------------------------------------
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then
AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
- wxUSE_DRAG_AND_DROP=no
+ 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])
- wxUSE_DRAG_AND_DROP=no
+ wxUSE_DRAG_AND_DROP=no
+ fi
+
+ if test "$USE_WIN32" = 1; then
+ dnl check for ole headers and disable DnD if not present (earlier
+ dnl versions of mingw32 don't have them)
+ AC_CHECK_HEADERS(ole2.h)
+ if test "x$HAVE_OLE2_H" = x ; then
+ AC_MSG_WARN(Drag and drop disabled because OLE headers not found)
+ wxUSE_DRAG_AND_DROP=no
+ fi
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
AC_DEFINE(wxUSE_DRAG_AND_DROP)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
fi
+
fi
if test "$wxUSE_SPLINES" = "yes" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
+if test "$wxUSE_NEW_GRID" = "yes"; then
+ AC_DEFINE(wxUSE_NEW_GRID)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
+fi
+
if test "$wxUSE_IMAGLIST" = "yes"; then
AC_DEFINE(wxUSE_IMAGLIST)
fi
if test "$wxUSE_SCROLLBAR" = "yes"; then
AC_DEFINE(wxUSE_SCROLLBAR)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
fi
if test "$wxUSE_SLIDER" = "yes"; then
if test "$wxUSE_WINE" = 1 ; then
AC_MSG_WARN([wxStaticLine is not supported under WINE])
else
- if test "$wxUSE_MOTIF" = 1 ; then
- AC_MSG_WARN([wxStaticLine is not supported under Motif])
- else
- AC_DEFINE(wxUSE_STATLINE)
- fi
+ AC_DEFINE(wxUSE_STATLINE)
fi
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
fi
+if test "$wxUSE_GIF" = "yes" ; then
+ AC_DEFINE(wxUSE_GIF)
+fi
+
+if test "$wxUSE_PCX" = "yes" ; then
+ AC_DEFINE(wxUSE_PCX)
+fi
+
+if test "$wxUSE_PNM" = "yes" ; then
+ AC_DEFINE(wxUSE_PNM)
+fi
+
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------
-dnl if we add wxUSE_GUI in the future, it might be handy to separate the libs
-dnl into GUI and non-GUI parts
GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
dnl all additional libraries (except wxWindows itself) we link with
-EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $GUILIBS"
-
-dnl all the libraries needed to link wxWindows programs (when the library is not
-dnl yet installed)
-LIBS="\${top_builddir}/src/${TOOLKIT_DIR}/${WX_LIBRARY_NAME} $EXTRA_LIBS"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+if test "$wxUSE_GUI" = "yes"; then
+ EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
+fi
dnl all the libraries needed to link wxWindows programs when using the
dnl makefile system without libtool
if test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
CXXWARNINGS="-Wall"
- dnl there is one weird warning in docview.h:71 which prevents me from doing
- dnl this...
+ dnl FIXME: there is one weird warning in docview.h:71 which prevents me from
+ dnl doing this... (VZ)
dnl CXXWARNINGS="-Wall -Werror"
fi
-EXTRA_CFLAGS="$WXDEBUG $PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
-CPPFLAGS="-I\${top_srcdir}/include $CPPFLAGS"
-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-CXXFLAGS="$CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS"
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
if test "$wxUSE_GUI" = "yes"; then
dnl TODO add checks that these samples will really compile (i.e. all the
dnl mfc, nativdlg, oleauto, ownerdrw, proplist
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
forty fractal image wxpoem"
+else
+ SAMPLES_SUBDIRS=""
fi
dnl for convenience, sort the samples in alphabetical order
AC_SUBST(WX_LIBRARY_LINK1)
AC_SUBST(WX_LIBRARY_LINK2)
AC_SUBST(WX_LIBRARY_LINK3)
+AC_SUBST(PROGRAM_EXT)
dnl are we supposed to create the links?
-AC_SUBST(WX_CREATE_LINKS)
-AC_SUBST(WX_CREATE_INSTALLED_LINKS)
+AC_SUBST(WX_ALL)
+AC_SUBST(WX_ALL_INSTALLED)
AC_SUBST(SHARED_LD)
AC_SUBST(PIC_FLAG)
+AC_SUBST(DEP_INFO_FLAGS)
dnl debugging options
AC_SUBST(WXDEBUG_DEFINE)
AC_SUBST(TOOLKIT_INCLUDE)
dnl what to compile
-AC_SUBST(GUIOBJS)
AC_SUBST(GUIHEADERS)
+AC_SUBST(GUIOBJS)
AC_SUBST(COMMONOBJS)
AC_SUBST(GENERICOBJS)
+AC_SUBST(GUIDEPS)
+AC_SUBST(COMMONDEPS)
+AC_SUBST(GENERICDEPS)
+AC_SUBST(IODBCOBJS)
AC_SUBST(UNIXOBJS)
+AC_SUBST(UNIXDEPS)
+AC_SUBST(ALL_OBJECTS)
+AC_SUBST(ALL_DEPFILES)
+AC_SUBST(ALL_HEADERS)
AC_SUBST(GUIDIST)
dnl additional subdirectories where we will build
AC_CONFIG_HEADER(setup.h:setup.h.in)
+dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some
+dnl genius called it "win"
+if test "${TOOLKIT_DIR}" = "msw" ; then
+ GL_TOOLKIT_DIR="win"
+else
+ GL_TOOLKIT_DIR="${TOOLKIT_DIR}"
+fi
+dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack!
+AC_SUBST(GL_TOOLKIT_DIR)
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 colon)
AC_OUTPUT([
wx-config
- src/make.env
- src/makeprog.env
- src/makelib.env
+ src/make.env
+ src/makeprog.env
+ src/makelib.env
Makefile
samples/Makefile
samples/bombs/Makefile
samples/checklst/Makefile
samples/config/Makefile
samples/controls/Makefile
- samples/dialogs/Makefile
- samples/docview/Makefile
- samples/docvwmdi/Makefile
- samples/dnd/Makefile
- samples/drawing/Makefile
- samples/dynamic/Makefile
- samples/image/Makefile
- samples/layout/Makefile
- samples/listctrl/Makefile
- samples/mdi/Makefile
- samples/minifram/Makefile
- samples/minimal/Makefile
- samples/notebook/Makefile
+ samples/db/Makefile
+ samples/dialogs/Makefile
+ samples/docview/Makefile
+ samples/docvwmdi/Makefile
+ samples/dnd/Makefile
+ samples/drawing/Makefile
+ samples/forty/Makefile
+ samples/font/Makefile
+ samples/fractal/Makefile
+ samples/image/Makefile
+ samples/internat/Makefile
+ samples/layout/Makefile
+ samples/listctrl/Makefile
+ samples/mdi/Makefile
+ samples/minifram/Makefile
+ samples/minimal/Makefile
+ samples/nettest/Makefile
+ samples/newgrid/Makefile
+ samples/notebook/Makefile
+ samples/png/Makefile
samples/printing/Makefile
samples/proplist/Makefile
- samples/sashtest/Makefile
- samples/scroll/Makefile
- samples/splitter/Makefile
- samples/text/Makefile
- samples/thread/Makefile
- samples/toolbar/Makefile
- samples/treectrl/Makefile
- samples/typetest/Makefile
- samples/validate/Makefile
- samples/wxpoem/Makefile
- samples/wxsocket/Makefile
- samples/wizard/Makefile
- samples/html/Makefile
- samples/html/about/Makefile
- samples/html/help/Makefile
- samples/html/printing/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
+ 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/wxpoem/Makefile
+ samples/wxsocket/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
],
[
chmod +x wx-config
- if test ! -d include; then
- mkdir include
- fi
- if test ! -d include/wx; then
- mkdir include/wx
- fi
- if test ! -d include/wx/${TOOLKIT_DIR}; then
- mkdir include/wx/${TOOLKIT_DIR}
- fi
- cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ if test ! -d include; then
+ mkdir include
+ fi
+ if test ! -d include/wx; then
+ mkdir include/wx
+ fi
+ if test ! -d include/wx/${TOOLKIT_DIR}; then
+ mkdir include/wx/${TOOLKIT_DIR}
+ fi
+ if test -f setup.h; then
+ mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ fi
],
[
- LN_S="${ac_cv_prog_LN_S}"
TOOLKIT_DIR="${TOOLKIT_DIR}"
]
)
projects / wxWidgets.git / blobdiff