return 0;
],
[
- AC_DEFINE(HAVE_BOOL)
wx_cv_cpp_bool=yes
],
[
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=1
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
USE_UNIX=1
USE_WIN32=0
USE_BEOS=0
+USE_MAC=0
USE_LINUX=
USE_SGI=
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-cygwin32* | *-*-mingw32* )
+ *-*-cygwin* | *-*-mingw32* )
USE_UNIX=0
USE_WIN32=1
AC_DEFINE(__WIN32__)
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
+ DEFAULT_wxUSE_SNGLINST_CHECKER=no
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_FILE=no
DEFAULT_wxUSE_TEXTFILE=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
+ DEFAULT_wxUSE_SNGLINST_CHECKER=yes
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_TEXTFILE=yes
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)
+WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
dnl ---------------------------------------------------------------------------
dnl "big" options (i.e. those which change a lot of things throughout the library)
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
+ dnl add the resources target
+ WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
dnl the name of the shared library
- WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
- WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
dnl the name of the links to the shared library
- WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.dylib"
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
- WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.dylib"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}"
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
;;
SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
WX_ALL=${WX_LIBRARY_NAME_SHARED}
;;
- *-*-cygwin32* )
+ *-*-cygwin* )
dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
AC_CHECK_HEADERS(strings.h)
+dnl defines HAVE_STDLIB_H
+AC_CHECK_HEADERS(stdlib.h)
dnl defines HAVE_UNISTD_H
AC_CHECK_HEADERS(unistd.h)
-dnl defines HAVE_FCNTL_H
-AC_CHECK_HEADERS(fcntl.h)
dnl defines HAVE_WCHAR_H
AC_CHECK_HEADERS(wchar.h)
dnl defines HAVE_WCSTR_H
ws = L"Hello, world!";
],
wx_cv_type_wchar_t=yes,
- wx_cv_type_wchar_t=no)
+ AC_TRY_COMPILE([#include <stdlib.h>],
+ [
+ wchar_t wc, *ws;
+ wc = L'a';
+ ws = L"Hello, world!";
+ ],
+ wx_cv_type_wchar_t=yes,
+ wx_cv_type_wchar_t=no)
+ )
])
if test "$wx_cv_type_wchar_t" = yes ; then
AC_DEFINE(wxUSE_WCHAR_T)
dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
dnl wchar_t an AC_CHECK_SIZEOF only includes stdio.h
+dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
[
AC_TRY_RUN(
[
- #include <wchar.h>
+ #ifdef HAVE_WCHAR_H
+ # include <wchar.h>
+ #endif
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
#include <stdio.h>
int main()
{
)
])
-AC_DEFINE_UNQUOTED(wxSIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t)
+AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t)
dnl for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
AC_DEFINE(HAVE_VSSCANF)
fi
-AC_LANG_RESTORE
-
dnl the following tests are for Unix(like) systems only
if test "$TOOLKIT" != "MSW"; then
dnl check for vfork() (even if it's the same as fork() in modern Unices)
AC_CHECK_FUNCS(vfork)
+dnl check for fcntl() or at least flock() needed by Unix implementation of
+dnl wxSingleInstanceChecker
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+ AC_CHECK_FUNCS(fcntl flock, break)
+
+ if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+ AC_MSG_WARN(wxSingleInstanceChecker not available)
+ wxUSE_SNGLINST_CHECKER=no
+ fi
+fi
+
dnl check for timegm() used by datetime.cpp
AC_CHECK_FUNCS(timegm)
-dnl look for a functiopn to modify the environment
+dnl look for a function to modify the environment
AC_CHECK_FUNCS(putenv setenv, break)
HAVE_SOME_SLEEP_FUNC=0
],
[
AC_CHECK_FUNCS(usleep,
- AC_DEFINE(HAVE_USLEEP),
- )
- AC_MSG_WARN([wxSleep() function will not work])
+ AC_DEFINE(HAVE_USLEEP),
+ AC_MSG_WARN([wxSleep() function will not work])
+ )
]
)
]
dnl AIX calls the library libpthreads - thanks IBM!
if test "$USE_AIX" = 1; then
THREADS_LIB=pthreads
- elif test "$USE_MAC" = 1; then
- THREADS_LIB=cc_dynamic
else
THREADS_LIB=pthread
fi
THREADS_OBJ="threadpsx.lo"
THREADS_LINK="c_r"
], [
- dnl thread functions are in libcc_dynamic under Mac OS X/Darwin
- AC_CHECK_LIB(cc_dynamic, pthread_create, [
- THREADS_OBJ="threadpsx.lo"
- THREADS_LINK="cc_dynamic"
- ], [
- dnl VZ: SGI threads are not supported currently
- AC_CHECK_HEADER(sys/prctl.h, [
- THREADS_OBJ="threadsgi.lo"
- ])
+ dnl VZ: SGI threads are not supported currently
+ AC_CHECK_HEADER(sys/prctl.h, [
+ THREADS_OBJ="threadsgi.lo"
])
])
])
]
)
])
- if test "$wx_cv_type_pthread_rec_mutex_init"="yes"; then
+ if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
else
dnl this may break code working elsewhere, so at least warn about it
TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
CPPFLAGS="${CPPFLAGS} -fno-common -fpascal-strings"
+ AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
+ AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+ RESCOMP=${REZ}
+ REZFLAGS="-d __UNIX__ -useDF"
+ DEREZFLAGS="Carbon.r -useDF"
+ RESFLAGS="Carbon.r -t APPL"
+ LIBWXMACRES="\$(LIBWX_MACRES)"
+ LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
fi
if test "$wxUSE_CYGWIN" = 1 ; then
TIFF_INCLUDE=
if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
AC_DEFINE(wxUSE_LIBTIFF)
- if test "$wxUSE_LIBTIFF" = "yes" ; then
+ if test "$wxUSE_LIBTIFF" = "yes" ; then
TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
else
TIFF_LINK=
AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
fi
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+ AC_DEFINE(wxUSE_SNGLINST_CHECKER)
+fi
+
if test "$wxUSE_BUSYINFO" = "yes"; then
AC_DEFINE(wxUSE_BUSYINFO)
fi
],
[
wx_cv_struct_tm_has_gmtoff=yes
- AC_DEFINE(WX_GMTOFF_IN_TM)
],
wx_cv_struct_tm_has_gmtoff=no
)
])
fi
+ if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+ AC_DEFINE(WX_GMTOFF_IN_TM)
+ fi
+
dnl check for gettimeofday (SVr4, BSD 4.3) and ftime (V7, BSD 4.3) for the
dnl function to be used for high resolution timers
AC_CHECK_FUNCS(gettimeofday ftime, break)
AC_SUBST(RESPROGRAM)
AC_SUBST(RESCOMP)
AC_SUBST(RESFLAGS)
+dnl additional for Mac OS X
+AC_SUBST(REZ)
+AC_SUBST(REZFLAGS)
+AC_SUBST(DEREZ)
+AC_SUBST(DEREZFLAGS)
+AC_SUBST(LIBWXMACRES)
+AC_SUBST(LIBWXMACRESCOMP)
dnl These seam to be missing
AC_SUBST(DLLTOOL)
if test -d include/wx; then
if test -d include/wx/${TOOLKIT_DIR}; then
if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
- mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h
+ mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h
fi
fi
fi
fi
-
+
AC_CONFIG_HEADER(setup.h:setup.h.in)
dnl some more GUI only things
chmod +x wx-config
mv wx-config wx${TOOLKIT_NAME}-config
${LN_S} wx${TOOLKIT_NAME}-config wx-config
-
+
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
fi
if test -f setup.h; then
cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
fi
-
+
],
[
TOOLKIT_DIR="${TOOLKIT_DIR}"
]
)
+dnl vi: set et ts=4 sw=4 list:
projects / wxWidgets.git / blobdiff