#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=2
+GTK_MICRO_VERSION=6
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
, enable_ansi=no)
AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib])
AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],
- echo $enable_xim, enable_xim="yes")
+ , enable_xim="yes")
AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ])
AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
- CFLAGS="$CFLAGS -DG_ENABLE_DEBUG"
+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
else
if test "x$enable_debug" = "xno"; then
- CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS"
+ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS"
else
- CFLAGS="$CFLAGS -DGTK_NO_CHECK_CASTS"
+ GTK_DEBUG_FLAGS="-DGTK_NO_CHECK_CASTS"
fi
fi
AC_PROG_INSTALL
AC_PROG_MAKE_SET
+changequote(,)dnl
if test "x$GCC" = "xyes"; then
- if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
- CFLAGS="$CFLAGS -Wall"
- fi
+ case " $CFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -Wall" ;;
+ esac
if test "x$enable_ansi" = "xyes"; then
- if test -z "`echo "$CFLAGS" | grep "\-ansi" 2> /dev/null`" ; then
- CFLAGS="$CFLAGS -ansi"
- fi
-
- if test -z "`echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null`" ; then
- CFLAGS="$CFLAGS -pedantic"
- fi
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -ansi" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -pedantic" ;;
+ esac
fi
fi
+changequote([,])dnl
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
CFLAGS=$gtk_save_CFLAGS
AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
-if test "x$enable_xim" = "xyes"; then
- CFLAGS="$CFLAGS -DUSE_XIM"
-fi
-
if test x$with_glib = xyes ; then
AC_MSG_ERROR([
*** Directory must be specified for --with-glib])
if test x$with_glib = x ; then
# Look for separately installed glib
- AM_PATH_GLIB(1.1.3,,
+ AM_PATH_GLIB(1.1.6,,
AC_MSG_ERROR([
-*** GLIB 1.1.3 or better is required. The latest version of GLIB
+*** GLIB 1.1.6 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org.]),
gmodule)
else
# Use uninstalled glib (assume they got the version right)
- if test -x $with_glib/glib-config ; then
+ GLIB_CONFIG=$with_glib/glib-config
+ if test -x $GLIB_CONFIG ; then
:
else
AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured])
fi
# For use in gtk-config
- glib_cflags=`$with_glib/glib-config --cflags`
- glib_libs=`$with_glib/glib-config --libs`
+ glib_cflags=`$GLIB_CONFIG --cflags`
+ glib_libs=`$GLIB_CONFIG --libs`
- glib_release=`$with_glib/glib-config --version | sed 's%\\.[[0-9]]*$%%'`
+ glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
# canonicalize relative paths
case $with_glib in
,
$x_libs)
+# Check for XIM support.
+
+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
+ : ,
+ enable_xim=no,
+ $x_libs)
+
+if test "x$enable_xim" = "xyes"; then
+ GTK_XIM_FLAGS="-DUSE_XIM"
+fi
+
x_cflags="$X_CFLAGS"
x_ldflags="$X_LDFLAGS $X_LIBS"
if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
AC_CHECK_LIB(pthread, pthread_attr_init,
- AC_DEFINE(USE_PTHREADS)
+ [AC_DEFINE(USE_PTHREADS)
x_libs="$x_libs -lpthread"
- CFLAGS="$CFLAGS -D_REENTRANT")
+ GTK_THREAD_FLAGS="-D_REENTRANT"],
+ # AIX has libpthreads, cause they're special. Special friends (TM)
+ AC_CHECK_LIB(pthreads, pthread_attr_init,
+ [AC_DEFINE(USE_PTHREADS)
+ x_libs="$x_libs -lpthreads"
+ GTK_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
fi
+CFLAGS="$saved_cflags"
+LDFLAGS="$saved_ldflags"
+
AC_SUBST(x_cflags)
AC_SUBST(x_includes)
AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
AC_SUBST(xinput_progs)
-CFLAGS="$saved_cflags"
-LDFLAGS="$saved_ldflags"
-
if test "x$enable_shm" = "xyes"; then
# Check for shared memory
AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
AC_MSG_RESULT($need_x_locale)
if test $need_x_locale = yes; then
- CFLAGS="$CFLAGS -DX_LOCALE"
+ GTK_LOCALE_CFLAGS="-DX_LOCALE"
fi
# Checks for header files.
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-# Checks for endianness (needed by GdkRgb).
-AC_C_BIGENDIAN
-
# Checks for library functions.
AC_TYPE_SIGNAL
AC_FUNC_MMAP
fi
fi
+# Duplicate `widechar' tests from `glib'.
+# Check for wchar.h
+if test x = y; then
+ # will not be executed
+ # hack so as not to update `acconfig.h'
+ AC_CHECK_HEADERS(wchar.h wctype.h)
+ AC_CHECK_FUNCS(broken_wctype)
+fi
+
+AC_MSG_CHECKING(for wchar.h)
+AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
+if test $gtk_ok = yes; then
+ ac_kludge=HAVE_WCHAR_H
+ AC_DEFINE($ac_kludge)
+fi
+AC_MSG_RESULT($gtk_ok)
+
+# Check for wctype.h (for iswalnum)
+
+AC_MSG_CHECKING(for wctype.h)
+AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
+if test $gtk_ok = yes; then
+ ac_kludge=HAVE_WCTYPE_H
+ AC_DEFINE($ac_kludge)
+fi
+AC_MSG_RESULT($gtk_ok)
+
+# in Solaris 2.5, `iswalnum' is in -lw
+GDK_WLIBS=
+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
+
+# The following is necessary for Linux libc-5.4.38
+oLIBS="$LIBS"
+LIBS="$LIBS $GDK_WLIBS"
+AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
+AC_TRY_LINK([#include <stdlib.h>],[
+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
+# ifdef HAVE_WCTYPE_H
+# include <wctype.h>
+# else
+# ifdef HAVE_WCHAR_H
+# include <wchar.h>
+# endif
+# endif
+#else
+# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
+#endif
+iswalnum((wchar_t) 0);
+], gtk_ok=yes, gtk_ok=no)
+LIBS="$oLIBS"
+
+if test $gtk_ok = no; then
+ ac_kludge=HAVE_BROKEN_WCTYPE
+ AC_DEFINE($ac_kludge)
+ GDK_WLIBS=
+fi
+AC_MSG_RESULT($gtk_ok)
+AC_SUBST(GDK_WLIBS)
+
+AC_SUBST(GTK_DEBUG_FLAGS)
+AC_SUBST(GTK_XIM_FLAGS)
+AC_SUBST(GTK_LOCALE_FLAGS)
+AC_SUBST(GTK_THREAD_FLAGS)
+
AC_OUTPUT([
Makefile
gtk-config