Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected wxWindows library name under Mac OS X

Browse Source 
corrected detection of wchar_t under Mac OS X
tweaked detection of pthread library under Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-06-10 20:20:20 +00:00
parent 7b724ca70d
commit 1f8ae82f59
2 changed files with 397 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

722
configure vendored
View File

File diff suppressed because it is too large Load Diff

44
configure.in
View File

@@ -2130,15 +2130,15 @@ if test "$wxUSE_SHARED" = "yes"; then
WX_ALL="CREATE_LINKS" WX_ALL="CREATE_LINKS"
fi fi
dnl add the resources target dnl add the resources target
WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r" WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
dnl the name of the shared library 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="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib" 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 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_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
WX_LIBRARY_LINK3="lib${WX_LIBRARY}.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_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib" WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
;; ;;
@@ -2237,6 +2237,8 @@ dnl ------------------------------------------------------------------------
dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example) dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
AC_CHECK_HEADERS(strings.h) AC_CHECK_HEADERS(strings.h)
dnl defines HAVE_STDLIB_H
AC_CHECK_HEADERS(stdlib.h)
dnl defines HAVE_UNISTD_H dnl defines HAVE_UNISTD_H
AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(unistd.h)
dnl defines HAVE_WCHAR_H dnl defines HAVE_WCHAR_H
@@ -2282,7 +2284,15 @@ AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
ws = L"Hello, world!"; ws = L"Hello, world!";
], ],
wx_cv_type_wchar_t=yes, 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 if test "$wx_cv_type_wchar_t" = yes ; then
AC_DEFINE(wxUSE_WCHAR_T) AC_DEFINE(wxUSE_WCHAR_T)
@@ -2336,11 +2346,17 @@ AC_CHECK_SIZEOF(long long, 0)
dnl we have to do it ourselves because SGI/Irix's stdio.h does not include 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 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_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
[ [
AC_TRY_RUN( 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> #include <stdio.h>
int main() int main()
{ {
@@ -2694,8 +2710,6 @@ if test "$wxUSE_THREADS" = "yes" ; then
dnl AIX calls the library libpthreads - thanks IBM! dnl AIX calls the library libpthreads - thanks IBM!
if test "$USE_AIX" = 1; then if test "$USE_AIX" = 1; then
THREADS_LIB=pthreads THREADS_LIB=pthreads
elif test "$USE_MAC" = 1; then
THREADS_LIB=cc_dynamic
else else
THREADS_LIB=pthread THREADS_LIB=pthread
fi fi
@@ -2712,15 +2726,9 @@ if test "$wxUSE_THREADS" = "yes" ; then
THREADS_OBJ="threadpsx.lo" THREADS_OBJ="threadpsx.lo"
THREADS_LINK="c_r" THREADS_LINK="c_r"
], [ ], [
dnl thread functions are in libcc_dynamic under Mac OS X/Darwin dnl VZ: SGI threads are not supported currently
AC_CHECK_LIB(cc_dynamic, pthread_create, [ AC_CHECK_HEADER(sys/prctl.h, [
THREADS_OBJ="threadpsx.lo" THREADS_OBJ="threadsgi.lo"
THREADS_LINK="cc_dynamic"
], [
dnl VZ: SGI threads are not supported currently
AC_CHECK_HEADER(sys/prctl.h, [
THREADS_OBJ="threadsgi.lo"
])
]) ])
]) ])
]) ])