X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5a87141b4edec05488729ab11a1ecc4ab09efeb..0c2f35dc94a4ae971cd2ed2a0c7464dc79cbc731:/configure.in diff --git a/configure.in b/configure.in index 5f22f8e682..76b1a6ee3a 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,8 @@ dnl Process this file with autoconf to produce a configure script. AC_REVISION($Id$)dnl +AC_PREREQ(2.57) + dnl --------------------------------------------------------------------------- dnl dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker, @@ -15,11 +17,16 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -dnl the file passed to AC_INIT should be specific to our package -AC_INIT([wx-config.in]) +AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org]) + +dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package +AC_CONFIG_SRCDIR([wx-config.in]) dnl sets build, host, target variables and the same with _alias -AC_CANONICAL_SYSTEM +AC_CANONICAL_BUILD +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + dnl When making releases do: dnl @@ -73,20 +80,21 @@ USE_MAC=0 dnl Unix kind USE_AIX= -USE_BSD= -USE_DARWIN= +USE_BSD= dnl any BSD +USE_DARWIN= dnl a.k.a. Mac OS X USE_FREEBSD= +USE_GNU= dnl GNU/Hurd USE_HPUX= USE_LINUX= USE_NETBSD= USE_OPENBSD= -USE_OSF= +USE_OSF= dnl OSF/1 (obsolete?) USE_SGI= -USE_SOLARIS= -USE_SUN= -USE_SUNOS= -USE_SVR4= -USE_SYSV= +USE_SOLARIS= dnl Solaris ("SunOS" >= 5) +USE_SUN= dnl SunOS or Solaris +USE_SUNOS= dnl old/real SunOS (obsolete) +USE_SVR4= dnl SysV R4 +USE_SYSV= dnl any System V USE_VMS= USE_ULTRIX= USE_UNIXWARE= @@ -131,6 +139,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0 PROGRAM_EXT= SO_SUFFIX=so +SAMPLES_RPATH_FLAG= dnl to support a new system, you need to add its canonical name (as determined dnl by config.sub or specified by the configure command line) to this "case" @@ -154,6 +163,16 @@ case "${host}" in fi DEFAULT_DEFAULT_wxUSE_GTK=1 ;; + *-*-gnu* ) + USE_GNU=1 + AC_DEFINE(__GNU__) + TMP=`uname -m` + if test "x$TMP" = "xalpha"; then + USE_ALPHA=1 + AC_DEFINE(__ALPHA__) + fi + DEFAULT_DEFAULT_wxUSE_GTK=1 + ;; *-*-irix5* | *-*-irix6* ) USE_SGI=1 USE_SVR4=1 @@ -317,7 +336,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -379,7 +397,6 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -482,6 +499,9 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_IFF=no DEFAULT_wxUSE_XPM=no DEFAULT_wxUSE_ICO_CUR=no + DEFAULT_wxUSE_ACCESSIBILITY=no + + DEFAULT_wxUSE_MONOLITHIC=yes else DEFAULT_wxUSE_UNIVERSAL=no @@ -490,7 +510,6 @@ else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -551,7 +570,6 @@ else DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes DEFAULT_wxUSE_POSTSCRIPT=yes - DEFAULT_wxUSE_X_RESOURCES=no DEFAULT_wxUSE_CLIPBOARD=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_DRAG_AND_DROP=yes @@ -654,6 +672,9 @@ else DEFAULT_wxUSE_PNM=yes DEFAULT_wxUSE_XPM=yes DEFAULT_wxUSE_ICO_CUR=yes + DEFAULT_wxUSE_ACCESSIBILITY=no + + DEFAULT_wxUSE_MONOLITHIC=yes fi dnl WX_ARG_WITH should be used to select whether an external package will be @@ -684,6 +705,7 @@ dnl doing dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI) +WX_ARG_ENABLE(monolithic, [ --disable-monolithic don't build wxWindows as single library], wxUSE_MONOLITHIC) if test "$wxUSE_GUI" = "yes"; then @@ -713,14 +735,13 @@ dnl for GUI only 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_SYS_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC) dnl --------------------------------------------------------------------------- dnl compile options dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED) -WX_ARG_ENABLE(soname, [ --enable-soname set the DT_SONAME field in ELF shared libraries], wxUSE_SONAME) WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) @@ -852,10 +873,8 @@ dnl --------------------------------------------------------------------------- dnl resources dnl --------------------------------------------------------------------------- -dnl WX_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], wxUSE_PROLOGIO) -WX_ARG_ENABLE(resources, [ --enable-resources use wxWindows resources], wxUSE_RESOURCES) - -WX_ARG_ENABLE(xresources, [ --enable-xresources use X resources for save (default for gtk+)], wxUSE_X_RESOURCES) +WX_ARG_ENABLE(prologio, [ --enable-prologio not available; see contrib], wxUSE_PROLOGIO) +WX_ARG_ENABLE(resources, [ --enable-resources not available; see contrib], wxUSE_RESOURCES) dnl --------------------------------------------------------------------------- dnl IPC &c @@ -959,16 +978,16 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then wxUSE_CLIPBOARD=no wxUSE_DRAG_AND_DROP=no wxUSE_DATAOBJ=no + # Generic notebook requires tab dialog + DEFAULT_wxUSE_TABDIALOG=yes DEFAULT_wxUSE_TOOLBAR_NATIVE=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_CALCTRL=no DEFAULT_wxUSE_SPINBTN=no DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_COLOURDLG=no DEFAULT_wxUSE_DRAGIMAGE=no DEFAULT_wxUSE_FINDREPLDLG=no DEFAULT_wxUSE_FONTDLG=no @@ -1053,6 +1072,7 @@ WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUS WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick (Linux only)], wxUSE_JOYSTICK) WX_ARG_ENABLE(metafile, [ --enable-metafiles use wxMetaFile (Windows only)], wxUSE_METAFILE) WX_ARG_ENABLE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE) +WX_ARG_ENABLE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY) dnl --------------------------------------------------------------------------- dnl support for image formats that do not rely on external library @@ -1166,7 +1186,11 @@ if test "$wxUSE_GUI" = "yes"; then fi done else - AC_MSG_RESULT(base ($host_alias hosted) only) + if test "x$host_alias" != "x"; then + AC_MSG_RESULT(base ($host_alias hosted) only) + else + AC_MSG_RESULT(base only) + fi fi dnl --------------------------------------------------------------------------- @@ -1430,10 +1454,24 @@ dnl ------------------------------------------------------------------------ dnl test for strings.h needed under AIX, but do not check for it wxMac as dnl it exists but is only a simple redirection to string.h and it is in dnl conflict with Strings.h in FlatCarbon headers -if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then - dnl defines HAVE_STRINGS_H - AC_CHECK_HEADERS(strings.h) +dnl +dnl Autoconf 2.5 tends to check for strings.h on its own, so avoiding the +dnl test (as the current configure script does) is not possible. Instead, +dnl you must remind autoconf that strings.h is NOT valid. The autoconf +dnl test succeeds because there is a strings.h file that simply includes +dnl string.h. Unfortunately, there is also a strings.h as part of the +dnl FlatCarbon headers. -- David Elliott +if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then + AC_CACHE_CHECK([for strings.h], ac_cv_header_strings_h, + [ac_cv_header_strings_h=no]) + if test "$ac_cv_header_strings_h" = "no"; then + AC_MSG_RESULT([forced no into cache]) + else + AC_MSG_WARN([strings.h is not compatible with Mac OS X]) + fi fi +dnl defines HAVE_STRINGS_H +AC_CHECK_HEADERS(strings.h) dnl defines HAVE_STDLIB_H AC_CHECK_HEADERS(stdlib.h) @@ -1676,7 +1714,7 @@ dnl check for glibc version dnl dnl VZ: I have no idea why had this check been there originally, but now dnl we could probably do without it by just always adding _GNU_SOURCE -if test "$USE_LINUX" = 1; then +if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[ AC_TRY_COMPILE([#include ], [ @@ -1742,7 +1780,7 @@ if test "$wxUSE_REGEX" != "no"; then if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then dnl according to Unix 98 specs, regcomp() is in libc but I believe that dnl on some old systems it may be in libregex - check for it too? - AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp)) + AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)]) if test "x$ac_cv_func_regcomp" != "xyes"; then if test "$wxUSE_REGEX" = "sys" ; then @@ -1787,14 +1825,12 @@ if test "$wxUSE_ZLIB" != "no" ; then dnl has anything more ancient (1.1.3 was released in July 1998) dnl anyhow AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h, - AC_TRY_RUN( + [AC_TRY_RUN( + dnl zlib.h defines ZLIB_VERSION="x.y.z" [ - dnl zlib.h defines ZLIB_VERSION="x.y.z" #include #include - dnl don't use the brackets as quotes, we need them - changequote(,) int main() { FILE *f=fopen("conftestval", "w"); @@ -1806,13 +1842,12 @@ if test "$wxUSE_ZLIB" != "no" ; then ZLIB_VERSION[4] >= '4')) ? "yes" : "no"); exit(0); } - changequote([,]) ], ac_cv_header_zlib_h=`cat conftestval`, ac_cv_header_zlib_h=no, dnl cross-compiling: don't have an answer, try later unset ac_cv_header_zlib_h - ) + )] ) dnl If the test above did not come up with a value (e.g. cross dnl compiling) then this should give a definitive answer @@ -1871,9 +1906,9 @@ if test "$wxUSE_LIBPNG" != "no" ; then dnl libpng version 0.9 is known to not work, if an even newer dnl version is required, just bump it up in the test below AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h, - AC_TRY_RUN( + [AC_TRY_RUN( + dnl png.h defines PNG_LIBPNG_VER=number [ - dnl png.h defines PNG_LIBPNG_VER=number #include #include @@ -1890,7 +1925,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then ac_cv_header_png_h=no, dnl cross-compiling: test (later) if we have any png.h unset ac_cv_header_png_h - ) + )] ) AC_CHECK_HEADER(png.h) @@ -2067,19 +2102,28 @@ if test "$USE_WIN32" = 1 ; then dnl --- FIXME: This is still a somewhat random list of libs, dnl --- some of them should probably be included conditionally. - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" + + if test "$wxUSE_ACCESSIBILITY" = "yes" ; then + LIBS="$LIBS -loleacc" + fi case "${host}" in *-*-cygwin* ) dnl Cygwin doesn't include these by default - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" + LIBS="$LIBS -lkernel32 -luser32" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" esac dnl add extra odbc libs if we have compiled in odbc + if test "$wxUSE_ODBC" = "sys" ; then + wxUSE_ODBC = "yes" + fi if test "$wxUSE_ODBC" = "yes" ; then LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS" + AC_DEFINE(wxUSE_ODBC) fi + dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw. RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" RESPROGRAMOBJ="\$(PROGRAM)_resources.o" @@ -2110,10 +2154,6 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_MSW" = 1 ; then TOOLKIT=MSW GUIDIST=MSW_DIST - - dnl -mwindows causes a heap of other default gui libs to be linked in. - dnl All platforms need this, except maybe cygwin - LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows" fi if test "$wxUSE_GTK" = 1; then @@ -2410,7 +2450,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$wxUSE_NANOX" = "yes"; then TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE" - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a" else GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link" @@ -2653,9 +2693,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$wxUSE_PM" = 1; then TOOLKIT=PM GUIDIST=GTK_DIST -dnl AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled]) -dnl wxUSE_PROLOGIO="yes" -dnl wxUSE_RESOURCES="yes" AC_MSG_WARN([OS/2 threads are not yet supported... disabled]) wxUSE_THREADS="no" fi @@ -2750,9 +2787,42 @@ dnl --------------------------------------------------------------------------- dnl Optional libraries included when system library is not used dnl --------------------------------------------------------------------------- -dnl ODBC objects are Unix only -if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" + +dnl ---------------------------------------------------------------- +dnl iODBC support +dnl ---------------------------------------------------------------- + +IODBC_C_SRC="" + + +dnl ODBC is handled seperately for MSW +if test "$TOOLKIT" != "MSW" ; then + + if test "$wxUSE_ODBC" != "no" ; then + AC_DEFINE(wxUSE_ODBC) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + + dnl is this still necessary in 2.5? + WXODBCFLAG="-D_IODBC_" + + + if test "$wxUSE_ODBC" = "sys" ; then + dnl This is not ideal we really ough to use the unixodbc-config + dnl or iodbc-config if they exist. + + AC_CHECK_HEADER(sql.h) + AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [ + wxUSE_ODBC=builtin; + AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ]) + ] ) + fi + dnl Not "no" either... + if test "$wxUSE_ODBC" != "sys" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" + fi + + fi + fi if test "$wxUSE_REGEX" = "builtin" ; then @@ -2772,6 +2842,19 @@ if test "$wxUSE_OPENGL" = "yes"; then elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" else + dnl David Elliott: Without this snippet AC_CHECK_HEADER fails to find + dnl GL/gl.h on Mac OS X where it is located in + dnl /usr/X11R6/include/GL/gl.h: + + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found in $ac_find_includes) + set -x + WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS) + CPPFLAGS="$CPPFLAGS$ac_path_to_include" + set +x + fi + AC_CHECK_HEADER(GL/gl.h, [ found_gl=0 @@ -2840,14 +2923,18 @@ if test -n "$TOOLKIT" ; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" fi +UNICODE=0 lib_unicode_suffix= if test "$wxUSE_UNICODE" = "yes"; then lib_unicode_suffix=u + UNICODE=1 fi lib_debug_suffix= +BUILD=release if test "$wxUSE_DEBUG_FLAG" = "yes"; then lib_debug_suffix=d + BUILD=debug fi WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` @@ -2945,7 +3032,9 @@ if test "$wxUSE_SHARED" = "yes"; then esac fi +SHARED=0 if test "$wxUSE_SHARED" = "yes"; then + SHARED=1 dnl install targets if test "$wxUSE_OPENGL" = "yes"; then @@ -2964,7 +3053,7 @@ if test "$wxUSE_SHARED" = "yes"; then dnl use versioned symbols if available on the platform - WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script]) + WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script]) dnl the command to use for creating the shared library SHARED_LD="${CXX} -shared -o" @@ -2992,7 +3081,7 @@ if test "$wxUSE_SHARED" = "yes"; then fi ;; - *-*-linux* ) + *-*-linux* | *-*-gnu* ) if test "$GCC" != "yes"; then AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc, [ @@ -3011,12 +3100,7 @@ if test "$wxUSE_SHARED" = "yes"; then fi fi - if test "$wxUSE_SONAME" = "yes" ; then - SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}" - SONAME_FLAGS_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 + SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" ;; *-*-solaris2* ) @@ -3024,11 +3108,36 @@ if test "$wxUSE_SHARED" = "yes"; then 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" + + dnl gcc may use Sun's ld, in which case -rpath gives a confusing + dnl error message. We have to try both -Wl,-rpath and -Wl,-R: + saveLdflags="$LDFLAGS" + LDFLAGS="$saveLdflags -Wl,-rpath,/" + AC_MSG_CHECKING([if the linker accepts -rpath]) + AC_TRY_LINK( + [],[], + [ + AC_MSG_RESULT([yes]) + SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" + ], + [ + AC_MSG_RESULT([no]) + AC_MSG_CHECKING([if the linker accepts -R]) + LDFLAGS="$saveLdflags -Wl,-R,/" + AC_TRY_LINK( + [],[], + [ + AC_MSG_RESULT([yes]) + SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"], + [ + AC_MSG_RESULT([no]) + ]) + ]) + LDFLAGS="$saveLdflags" else SHARED_LD="${CXX} -G -o" PIC_FLAG="-KPIC" - SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}" - SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}" + SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; @@ -3044,11 +3153,6 @@ if test "$wxUSE_SHARED" = "yes"; then dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o" PIC_FLAG="-dynamic -fPIC" - dnl library installation base name and wxMac resources file base name - dnl must be identical in order for the resource file to be found at - dnl run time in src/mac/app.cpp - SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}" - SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}" ;; *-*-aix* ) @@ -3155,7 +3259,7 @@ MACSETFILE="@#" MACRESWXCONFIG="#" if test "$wxUSE_MAC" = 1; then dnl add the resources target for wxMac - LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" + LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}" WX_ALL="${WX_ALL} ${LIBWXMACRES}" WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res" AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez) @@ -3166,14 +3270,14 @@ if test "$wxUSE_MAC" = 1; then dnl since the carb resource *must* be included in the application MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o" MACSETFILE="\$(SETFILE)" - MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o" + MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" elif test "$wxUSE_COCOA" = 1; then AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez) AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez) AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile) MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o" MACSETFILE="\$(SETFILE)" - MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o" + MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" else if test "$wxUSE_PM" = 1; then MACRESCOMP="emxbind -ep" @@ -3196,11 +3300,12 @@ dnl defines uid_t and gid_t if not already defined AC_TYPE_UID_T dnl check what exactly size_t is on this machine - this is necessary to avoid -dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h +dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_CACHE_CHECK([if size_t is unsigned int], wx_cv_size_t_is_uint, + [ dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate dnl methods in a local class (i.e. class inside a function) declaration @@ -3218,6 +3323,7 @@ AC_CACHE_CHECK([if size_t is unsigned int], wx_cv_size_t_is_uint=no, wx_cv_size_t_is_uint=yes ) + ] ) if test "$wx_cv_size_t_is_uint" = "yes"; then @@ -3623,6 +3729,20 @@ fi fi dnl if !MSW + +dnl ------------------------------------------ +dnl Checks specific to contrib libs (MMedia) +dnl ------------------------------------------ + +dnl Check for ESD: +ESD_LINK= +AC_CHECK_HEADER([esd.h], [ + AC_CHECK_LIB(esd, esd_close, [ + ESD_LINK="-lesd" + ]) +]) + + dnl =========================================================================== dnl Now we have all the info we need - use it! dnl =========================================================================== @@ -3840,17 +3960,17 @@ if test "$TOOLKIT" != "MSW"; then dnl 3. pthread_attr_getschedparam and pthread_attr_setschedparam HAVE_PRIOR_FUNCS=0 AC_CHECK_FUNC(pthread_attr_getschedpolicy, - AC_CHECK_FUNC(pthread_attr_setschedparam, - AC_CHECK_FUNC(sched_get_priority_max, + [AC_CHECK_FUNC(pthread_attr_setschedparam, + [AC_CHECK_FUNC(sched_get_priority_max, HAVE_PRIOR_FUNCS=1, - AC_CHECK_LIB([posix4], sched_get_priority_max, + [AC_CHECK_LIB([posix4], sched_get_priority_max, [ HAVE_PRIOR_FUNCS=1 POSIX4_LINK=" -lposix4" ], - ) - ) - ) + )] + )] + )] ) if test "$HAVE_PRIOR_FUNCS" = 1; then @@ -4454,9 +4574,6 @@ if test "$wxUSE_SOCKETS" = "yes" ; then AC_CACHE_CHECK([what is the type of the third argument of getsockname], wx_cv_type_getsockname3, [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE( [ #include @@ -4467,32 +4584,45 @@ if test "$wxUSE_SOCKETS" = "yes" ; then getsockname(0, 0, &len); ], wx_cv_type_getsockname3=socklen_t, - AC_TRY_COMPILE( - [ - #include - #include - ], - [ - size_t len; - getsockname(0, 0, &len); - ], - wx_cv_type_getsockname3=size_t, + [ + dnl the compiler will compile the version with size_t + dnl even if the real type of the last parameter is int + dnl but it should give at least a warning about + dnl converting between incompatible pointer types, so + dnl try to use it to get the correct behaviour at + dnl least with gcc (otherwise we'd always use size_t) + CFLAGS_OLD="$CFLAGS" + if test "$GCC" = yes ; then + CFLAGS="$CFLAGS -Werror" + fi + AC_TRY_COMPILE( [ #include #include ], [ - int len; + size_t len; getsockname(0, 0, &len); ], - wx_cv_type_getsockname3=int, - wx_cv_type_getsockname3=unknown + wx_cv_type_getsockname3=size_t, + AC_TRY_COMPILE( + [ + #include + #include + ], + [ + int len; + getsockname(0, 0, &len); + ], + wx_cv_type_getsockname3=int, + wx_cv_type_getsockname3=unknown + ) ) - ) - ) - AC_LANG_RESTORE + CFLAGS="$CFLAGS_OLD" + ] + ) ]) if test "$wx_cv_type_getsockname3" = "unknown"; then @@ -4651,18 +4781,6 @@ if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF) fi - -dnl ---------------------------------------------------------------- -dnl iODBC support -dnl ---------------------------------------------------------------- - -IODBC_C_SRC="" -if test "$wxUSE_ODBC" = "yes" ; then - AC_DEFINE(wxUSE_ODBC) - WXODBCFLAG="-D_IODBC_" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" -fi - dnl ---------------------------------------------------------------- dnl Register PostScript options for makefiles and setup.h dnl ---------------------------------------------------------------- @@ -4735,25 +4853,8 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi -dnl if test "$wxUSE_PROLOGIO" = "yes" ; then -dnl AC_DEFINE(wxUSE_PROLOGIO) -dnl ALL_OBJECTS="$ALL_OBJECTS parser.o" -dnl fi - -dnl if test "$wxUSE_RESOURCES" = "yes" ; then -dnl if test "$wxUSE_NANOX" = "yes"; then -dnl AC_MSG_WARN([Cannot use resource database functions in NanoX]) -dnl else -dnl AC_DEFINE(wxUSE_RESOURCES) -dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" -dnl fi -dnl if test "$wxUSE_PROLOGIO" != "yes" ; then -dnl ALL_OBJECTS="$ALL_OBJECTS parser.o" -dnl fi -dnl fi - -if test "$wxUSE_X_RESOURCES" = "yes"; then - AC_DEFINE(wxUSE_X_RESOURCES) +if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then + AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only]) fi dnl --------------------------------------------------------------------------- @@ -5150,6 +5251,11 @@ if test "$wxUSE_DRAGIMAGE" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" fi +if test "$wxUSE_ACCESSIBILITY" = "yes"; then + AC_DEFINE(wxUSE_ACCESSIBILITY) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" +fi + if test "$wxUSE_MENUS" = "yes"; then AC_DEFINE(wxUSE_MENUS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" @@ -5209,7 +5315,7 @@ fi if test "$wxUSE_HTML" = "yes"; then AC_DEFINE(wxUSE_HTML) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox" fi if test "$wxUSE_VALIDATORS" = "yes"; then @@ -5351,7 +5457,7 @@ fi AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX") dnl define the variables used in wx-config -top_builddir=`pwd` +top_builddir_wxconfig=`pwd` dnl --------------------------------------------------------------------------- dnl Output the makefiles and such from the results found above @@ -5429,8 +5535,9 @@ if test "$wxUSE_GUI" = "yes"; then drawing dynamic erase event exec font image \ minimal propsize rotate shaped widgets" - dnl this is needed to be able to find AFM files - CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" + if test "$wxUSE_MONOLITHIC" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" + fi else SAMPLES_SUBDIRS="console" fi @@ -5443,43 +5550,78 @@ dnl and other stuff for the built in libraries should come first to avoid dnl including the system headers with the same name (it is particularly dnl important for zlib because XFree 4.2.0 has its own, horribly old and dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow -INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \ +INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \ -I\${top_srcdir}/include \ $REGEX_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 dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" CXXWARNINGS="-Wall" dnl should enable this one day... dnl CXXWARNINGS="-Wall -Werror" - - dnl Add this *after* all compile tests, we don't need or want generated - dnl depfiles until actually building the lib - if test "$wxUSE_NO_DEPS" = "no" ; then - CFLAGS="-MMD $CFLAGS" - CXXFLAGS="-MMD $CXXFLAGS" - fi fi EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" dnl remove the extra white space from the cc/c++/ld options CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` -CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` -CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` +CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` +CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` LIBS=`echo $LIBS | sed 's/ \+/ /g'` LDFLAGS="$LDFLAGS $PROFILE" +dnl wxGTK does not need TOOLKIT includes in wx-config +if test "$wxUSE_GTK" = 1; then + WXCONFIG_INCLUDE= +else + WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE" +fi + +if test "x$wxUSE_UNIVERSAL" = "xyes" ; then + WXUNIV=1 +else + WXUNIV=0 +fi + +AC_SUBST(wxUSE_ZLIB) +AC_SUBST(wxUSE_REGEX) +AC_SUBST(wxUSE_ODBC) +AC_SUBST(wxUSE_LIBJPEG) +AC_SUBST(wxUSE_LIBPNG) +AC_SUBST(wxUSE_LIBTIFF) + +EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" + +if test $wxUSE_MONOLITHIC = "yes" ; then + MONOLITHIC=1 +else + MONOLITHIC=0 +fi + +dnl FIXME -- make configurable! +VENDOR="custom" +OFFICIAL_BUILD=0 +AC_SUBST(VENDOR) +AC_SUBST(OFFICIAL_BUILD) + +AC_SUBST(WXUNIV) +AC_SUBST(MONOLITHIC) +AC_SUBST(EXTRALIBS) +AC_SUBST(UNICODE) +AC_SUBST(BUILD) +AC_SUBST(SHARED) +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]` +AC_SUBST(TOOLKIT_LOWERCASE) +AC_SUBST(TOOLKIT_VERSION) +AC_SUBST(SAMPLES_RPATH_FLAG) + +AC_BAKEFILE + + + dnl for convenience, sort the samples in alphabetical order dnl dnl FIXME For some mysterious reasons, sometimes the directories are duplicated @@ -5520,12 +5662,7 @@ AC_SUBST(WX_ALL_INSTALLED) AC_SUBST(SHARED_LD) AC_SUBST(PIC_FLAG) -AC_SUBST(CODE_GEN_FLAGS) -AC_SUBST(CODE_GEN_FLAGS_CXX) -AC_SUBST(SONAME_FLAGS) -AC_SUBST(SONAME_FLAGS_GL) -AC_SUBST(WX_TARGET_LIBRARY_SONAME) AC_SUBST(WX_TARGET_LIBRARY_TYPE) AC_SUBST(STATIC_FLAG) @@ -5545,7 +5682,7 @@ AC_SUBST(TOOLCHAIN_DEFS) AC_SUBST(TOOLCHAIN_DLL_DEFS) dnl wx-config options -AC_SUBST(top_builddir) +AC_SUBST(top_builddir_wxconfig) AC_SUBST(host_alias) AC_SUBST(cross_compiling) AC_SUBST(WXCONFIG_LIBS) @@ -5555,6 +5692,8 @@ AC_SUBST(WXCONFIG_LIBS_STATIC_GL) AC_SUBST(WXCONFIG_INCLUDE) AC_SUBST(WXCONFIG_RPATH) AC_SUBST(WX_LARGEFILE_FLAGS) +AC_SUBST(CODE_GEN_FLAGS) +AC_SUBST(CODE_GEN_FLAGS_CXX) dnl the list of files to compile/install AC_SUBST(ALL_OBJECTS) @@ -5576,7 +5715,6 @@ AC_SUBST(LDFLAGS_VERSIONING) AC_SUBST(LDFLAGS_EXE) AC_SUBST(OPENGL_LIBS) AC_SUBST(DMALLOC_LIBS) -AC_SUBST(EXTRADEFS) AC_SUBST(WX_VERSION_TAG) dnl additional resurces settings @@ -5604,6 +5742,10 @@ AC_SUBST(MAKEINFO) AC_SUBST(INSTALL_LIBRARY) AC_SUBST(INSTALL_DIR) +dnl contrib tests results: +AC_SUBST(ESD_LINK) + + dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am dnl - and we do use it) @@ -5614,45 +5756,18 @@ if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h fi -AC_CONFIG_HEADER(setup.h:setup.h.in) - -dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in -dnl samples and the only way to do it is to use the environment (another -dnl idea could have been to use the cache but this wouldn't work when -dnl configure doesn't use cache at all which is the default with autoconf 2.50) -wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS -wx_cv_if_gnu_make=$IF_GNU_MAKE -wx_cv_path_ifs=$PATH_IFS -wx_cv_program_ext=$PROGRAM_EXT -wx_cv_target_library=$WX_TARGET_LIBRARY -wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL -wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE -wx_cv_library_basename=${WX_LIBRARY_BASENAME} -wx_cv_release=${WX_RELEASE} -wx_cv_current=${WX_CURRENT} -wx_cv_revision=${WX_REVISION} -wx_cv_age=${WX_AGE} -wx_cv_use_gui=${USE_GUI} -wx_cv_use_resources=${wxUSE_RESOURCES} -export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ - wx_cv_path_ifs wx_cv_program_ext \ - wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ - wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \ - wx_cv_use_gui wx_cv_use_resources - -AC_CONFIG_SUBDIRS(demos samples utils contrib) +AC_CONFIG_HEADERS([setup.h]) 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([ +AC_CONFIG_FILES([ wx-config version-script - src/make.env - src/makeprog.env - src/makelib.env Makefile - ], + ]) + +AC_CONFIG_COMMANDS([default], [ dnl This test is required to make the following idempotent. dnl Otherwise running config.status or rerunning configure @@ -5692,11 +5807,57 @@ AC_OUTPUT([ ] ) + +dnl Configure samples, contrib etc. directories, but only if they are present: +if test "$wxUSE_GUI" = "yes"; then + SUBDIRS="samples demos utils contrib" +else dnl we build wxBase only + dnl there are no wxBase programs in contrib nor demos + SUBDIRS="samples utils" +fi + +for subdir in `echo $SUBDIRS`; do + if test -d ${srcdir}/${subdir} ; then + if test "$wxUSE_GUI" = "yes"; then + if test ${subdir} = "samples"; then + dnl only take those samples which compile in the current + dnl configuration and which exist + for sample in `echo $SAMPLES_SUBDIRS`; do + if test -d $srcdir/samples/$sample; then + makefiles="samples/$sample/Makefile.in $makefiles" + fi + done + else dnl assume that everything compiles for utils &c + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + fi + else dnl we build wxBase only + dnl don't take all samples/utils, just those which build with + dnl wxBase + if test ${subdir} = "samples"; then + makefiles="samples/console/Makefile.in" + else dnl utils + makefiles="utils/HelpGen/Makefile.in \ + utils/HelpGen/src/Makefile.in \ + utils/makegen/Makefile.in" + fi + fi + + for mkin in $makefiles ; do + mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'` + AC_CONFIG_FILES([$mk]) + done + fi +done + + +AC_OUTPUT + dnl report on what we decided to do echo echo "Configured wxWindows ${WX_VERSION} for \`${host}'" echo "" echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}" +echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}" @@ -5713,6 +5874,7 @@ echo " png ${wxUSE_LIBPNG-n echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" echo " zlib ${wxUSE_ZLIB}" +echo " odbc ${wxUSE_ODBC}" echo ""