#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=2
-GTK_INTERFACE_AGE=0
-GTK_BINARY_AGE=0
+GTK_MICRO_VERSION=12
+GTK_INTERFACE_AGE=1
+GTK_BINARY_AGE=1
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_MINOR_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 ])
-AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
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
# Checks for programs.
AC_PROG_CC
+AC_ISC_POSIX
AM_PROG_CC_STDC
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
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -ansi" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -pedantic" ;;
+ esac
+ fi
+fi
+changequote([,])dnl
- if test -z "`echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null`" ; then
- CFLAGS="$CFLAGS -pedantic"
- fi
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
+
+AC_PROG_AWK
+AC_CHECK_PROGS(PERL, perl5 perl)
+
+# We would like indent, but don't require it.
+AC_CHECK_PROG(INDENT, indent, indent)
+
+REBUILD=\#
+if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
+ if test -n "$AWK" ; then
+ REBUILD=
fi
fi
+AC_SUBST(REBUILD)
+
+# i18n stuff
+ALL_LINGUAS="cs de es fr it ja ko nl no pl pt sv"
+AM_GTK_GNU_GETTEXT
+AC_CHECK_FUNC(gettext,
+ ,
+ AC_CHECK_LIB(intl, gettext)
+)
+
+dnl The DU4 header files don't provide library prototypes unless
+dnl -std1 is given to the native cc.
+AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
-AC_MSG_CHECKING([For extra flags to get ANSI library prototypes])
-gtk_save_LDFLAGS=$LDFLAGS
+gtk_save_LIBS=$LIBS
LIBS="$LIBS -lm"
AC_TRY_RUN([#include <math.h>
int main (void) { return (log(1) != log(1.)); }],
)
LIBS=$gtk_save_LIBS
-if test "x$enable_xim" = "xyes"; then
- CFLAGS="$CFLAGS -DUSE_XIM"
-fi
+dnl NeXTStep cc seems to need this
+AC_MSG_CHECKING([for extra flags for POSIX compliance])
+AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
+ AC_MSG_RESULT(none needed),
+ gtk_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -posix"
+ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
+ AC_MSG_RESULT(-posix),
+ AC_MSG_RESULT()
+ CFLAGS=$gtk_save_CFLAGS
+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
if test x$with_glib = xyes ; then
AC_MSG_ERROR([
if test x$with_glib = x ; then
# Look for separately installed glib
- AM_PATH_GLIB(1.1.3,,
+ AM_PATH_GLIB(1.1.12,,
AC_MSG_ERROR([
-*** GLIB 1.1.3 or better is required. The latest version of GLIB
+*** GLIB 1.1.12 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org.]),
- gmodule)
+ gmodule gthread)
- glib_cflags=$GLIB_CFLAGS
- glib_libs=$GLIB_LIBS
+ # we do not want to make all gtk progs to link to thread libraries.
+ glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
+ glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+ GLIB_LIBS="$glib_libs"
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 gmodule`
+ glib_libs=`$GLIB_CONFIG --libs gmodule`
- 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"
AC_DEFINE(XINPUT_NONE)
fi
-# Threads
-
-if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
- AC_CHECK_LIB(pthread, pthread_attr_init,
- AC_DEFINE(USE_PTHREADS)
- x_libs="$x_libs -lpthread"
- CFLAGS="$CFLAGS -D_REENTRANT")
-fi
+CFLAGS="$saved_cflags"
+LDFLAGS="$saved_ldflags"
AC_SUBST(x_cflags)
AC_SUBST(x_includes)
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_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
- # Check whether shmctl IPC_RMID allowes subsequent attaches
- if test "$ac_cv_header_sys_shm_h" = "yes"; then
- AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
- int main()
- {
- int id;
- char *shmaddr;
- id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777);
- if (id == -1)
- exit (2);
- shmaddr = shmat (id, 0, 0);
- shmctl (id, IPC_RMID, 0);
- if ((char*) shmat (id, 0, 0) == (char*) -1)
- {
- shmdt (shmaddr);
- exit (1);
- }
- shmdt (shmaddr);
- shmdt (shmaddr);
- exit (0);
- }
- ],
- AC_DEFINE(IPC_RMID_DEFERRED_RELEASE)
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no),
- AC_MSG_RESULT(assuming no))
- fi
-
# Check for the X shared memory extension header file
AC_MSG_CHECKING(X11/extensions/XShm.h)
if test "x$no_xext_lib" = "xyes"; then
fi
fi
-# Check for private display resource base variable
-AC_MSG_CHECKING(resource base field in XDisplay)
-AC_CACHE_VAL(gtk_cv_display_resource_base,
-[AC_TRY_RUN([
-#define XLIB_ILLEGAL_ACCESS
-#include <X11/Xlib.h>
-
-int
-main ()
-{
- Display *display;
-
- return 0;
-
- display->resource_base;
-}],
-gtk_cv_display_resource_base="resource_base",
-gtk_cv_display_resource_base="private3")])
-AC_MSG_RESULT($gtk_cv_display_resource_base)
-AC_DEFINE_UNQUOTED(RESOURCE_BASE, gdk_display->$gtk_cv_display_resource_base)
-
# Check if X_LOCALE definition is necessary
AC_MSG_CHECKING(need -DX_LOCALE)
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_OUTPUT([
Makefile
gtk-config
+po/Makefile.in
docs/Makefile
gdk/Makefile
gtk/Makefile