#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=5
+GTK_MICRO_VERSION=7
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
# Checks for programs.
AC_PROG_CC
+AC_ISC_POSIX
AM_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
fi
AC_SUBST(REBUILD)
+# i18n stuff
+ALL_LINGUAS="de pt"
+AM_GNU_GETTEXT_GTK
+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])
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.5,,
+ AM_PATH_GLIB(1.1.6,,
AC_MSG_ERROR([
-*** GLIB 1.1.5 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)
+ gmodule gthread)
glib_cflags=$GLIB_CFLAGS
glib_libs=$GLIB_LIBS
,
$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
-
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
-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"],
- # 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"
- CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"]))
-fi
-
AC_SUBST(x_cflags)
AC_SUBST(x_includes)
AC_SUBST(x_ldflags)
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.
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
+po/Makefile.in
docs/Makefile
gdk/Makefile
gtk/Makefile
projects / ~andy / gtk / blobdiff