AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Configure checks for:

Browse Source 
sizeof(wchar_t)
iconv.h
langinfo.h
gtk+ 1.3.1, defines __WXGTK20__ (I removed __WXGTK13__)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven 2000-07-19 08:08:43 +00:00
parent ecc7ceee42
commit 6f72b08293
3 changed files with 927 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1410
configure vendored
View File

File diff suppressed because it is too large Load Diff

28
configure.in
View File

@ -1541,7 +1541,7 @@ GUI_TK_LINK=
WXGTK12=
WXGTK127=
WXGTK13=
WXGTK20=
WXWINE=
@ -1601,10 +1601,12 @@ fi
if test "$wxUSE_GTK" = 1; then
dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
dnl and only then, if it wasn't found, for an older one
AM_PATH_GTK(1.2.7, WXGTK127=1)
AM_PATH_GTK(1.2.3, WXGTK12=1)
AM_PATH_GTK_2_0(1.3.1, WXGTK20=1,[
AM_PATH_GTK(1.2.7, WXGTK127=1)
AM_PATH_GTK(1.2.3, WXGTK12=1)
], gthread)
if test "$WXGTK12" != 1; then
if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then
AC_MSG_ERROR([
Please check that gtk-config is in path, the directory
where GTK+ libraries are installed (returned by
@ -1613,15 +1615,6 @@ if test "$wxUSE_GTK" = 1; then
])
fi
dnl it doesn't really work with 1.3.0 now...
dnl AM_PATH_GTK(1.3.0,
dnl WXGTK13=1,
dnl AM_PATH_GTK(1.2.1,
dnl WXGTK12=1,
dnl AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?)
dnl )
dnl )
TOOLKIT_INCLUDE="$GTK_CFLAGS"
dnl Appending gthreads as it was done here is not portable, instead
@ -2211,6 +2204,10 @@ dnl defines HAVE_WCSTR_H
AC_CHECK_HEADERS(wcstr.h)
dnl defines HAVE_FNMATCH_H
AC_CHECK_HEADERS(fnmatch.h)
dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
AC_CHECK_HEADERS(iconv.h)
dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
AC_CHECK_HEADERS(langinfo.h)
if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_UNIX" = "yes"; then
@ -2274,6 +2271,7 @@ dnl check the sizes of integral types (give some reasonable default values for
dnl cross-compiling)
dnl defines the size of certain types of variables in SIZEOF_<TYPE>
AC_CHECK_SIZEOF(char, 1)
AC_CHECK_SIZEOF(wchar_t, 4)
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(int *, 4)
AC_CHECK_SIZEOF(int, 4)
@ -2667,8 +2665,8 @@ else
fi
fi
if test "$WXGTK13" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK13__,$WXGTK13)
if test "$WXGTK20" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK20)
WXGTK12=1
fi

11
setup.h.in
View File

@ -65,7 +65,7 @@
#undef __WXGTK127__
/* Define this if your version of GTK+ is greater than 1.3 */
#undef __WXGTK13__
#undef __WXGTK20__
/*
* Define to 1 for Unix[-like] system
@ -703,6 +703,9 @@
/* The number of bytes in a char. */
#undef SIZEOF_CHAR
/* The number of bytes in a wchar_t. */
#undef SIZEOF_WCHAR_T
/* The number of bytes in a int. */
#undef SIZEOF_INT
@ -781,6 +784,12 @@
/* Define if you have the <wcstr.h> header file. */
#undef HAVE_WCSTR_H
/* Define if you have the <iconv.h> header file. */
#undef HAVE_ICONV_H
/* Define if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H
/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
#undef HAVE_XIM