# Process this file with autoconf to produce a configure script.
AC_INIT(gdk/gdktypes.h)
+# In the following, there are a the following variants
+# of GLib cflags and libs variables
+#
+# GLIB_CFLAGS: cflags for compiling libraries and example progs
+# GLIB_LIBS: libraries for linking example programs
+# GLIB_DEPLIBS: libraries for linking libraries against
+# glib_cflags: cflags to store in gtk-config
+# glib_libs: libs to store in gtk-config
+# glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
+# glib_thread_libs: libs to store in gtk-config for gtk-config gthread
+
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
+dnl we to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+#
# Making releases:
# GTK_MICRO_VERSION += 1;
# GTK_INTERFACE_AGE += 1;
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
#
GTK_MAJOR_VERSION=1
-GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=7
+GTK_MINOR_VERSION=2
+GTK_MICRO_VERSION=0
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
+dnl
+AC_DIVERT_POP()dnl
+
AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_MINOR_VERSION)
AC_SUBST(GTK_MICRO_VERSION)
AC_CANONICAL_HOST
+dnl figure debugging default, prior to $ac_help setup
+dnl
+AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
+ debug_default=yes
+else
+ debug_default=minimum
+fi
+AC_DIVERT_POP()dnl
+
+dnl declare --enable-* args and collect ac_help strings
+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]],
echo $enable_shm, enable_shm="yes")
-AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]],,enable_debug=minimum)
AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
, 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]],
, enable_xim="yes")
+AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],
+ , enable_xim_inst="maybe")
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"
AC_SUBST(REBUILD)
# i18n stuff
-ALL_LINGUAS="de pt"
+ALL_LINGUAS="cs de es fr hu it ja ko nl no pl pt ru sv"
AM_GTK_GNU_GETTEXT
AC_CHECK_FUNC(gettext,
,
AC_CHECK_LIB(intl, gettext)
)
+# AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+gtklocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(gtklocaledir)
dnl The DU4 header files don't provide library prototypes unless
dnl -std1 is given to the native cc.
if test x$with_glib = x ; then
# Look for separately installed glib
- AM_PATH_GLIB(1.1.6,,
+ AM_PATH_GLIB(1.2.0,,
AC_MSG_ERROR([
-*** GLIB 1.1.6 or better is required. The latest version of GLIB
-*** is always available from ftp://ftp.gtk.org.]),
+*** GLIB 1.2.0 or better is required. The latest version of GLIB
+*** is always available from ftp://ftp.gtk.org/.]),
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_thread_cflags="$GLIB_CFLAGS"
+ glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+ glib_thread_libs="$GLIB_LIBS"
+ GLIB_LIBS="$glib_libs"
+ GLIB_DEPLIBS="$glib_libs"
else
# Use uninstalled glib (assume they got the version right)
fi
# For use in gtk-config
- glib_cflags=`$GLIB_CONFIG --cflags`
- glib_libs=`$GLIB_CONFIG --libs`
+ glib_cflags=`$GLIB_CONFIG --cflags gmodule`
+ glib_thread_cflags=`$GLIB_CONFIG --cflags gmodule gthread`
+ glib_libs=`$GLIB_CONFIG --libs gmodule`
+ glib_thread_libs=`$GLIB_CONFIG --libs gmodule gthread`
glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
;;
esac
- GLIB_CFLAGS="-I$glib_dir"
- GLIB_LIBS=$glib_dir/libglib-$glib_release.la
+ GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
+ GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule.la"
+ GLIB_DEPLIBS=
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(glib_cflags)
AC_SUBST(glib_libs)
+AC_SUBST(glib_thread_cflags)
+AC_SUBST(glib_thread_libs)
+AC_SUBST(GLIB_DEPLIBS)
# Find the X11 include and library directories
AC_PATH_X
AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
: ,
- enable_xim=no,
+ enable_xim_inst="no",
$x_libs)
+# On Solaris, calling XRegisterIMInstantiateCallback seems to
+# cause an immediate segfault, so we disable it, unless
+# the user specifically forces it to be on.
+
+if test x$enable_xim_inst = xmaybe ; then
+ case host in
+ *-*-solaris*)
+ enable_xim_inst="no"
+ ;;
+ *)
+ enable_xim_inst="yes"
+ ;;
+ esac
+fi
+
if test "x$enable_xim" = "xyes"; then
GTK_XIM_FLAGS="-DUSE_XIM"
+ if test "x$enable_xim_inst" = "xyes"; then
+ AC_DEFINE(USE_X11R6_XIM)
+ fi
fi
x_cflags="$X_CFLAGS"
AC_SUBST(GTK_DEBUG_FLAGS)
AC_SUBST(GTK_XIM_FLAGS)
AC_SUBST(GTK_LOCALE_FLAGS)
-AC_SUBST(GTK_THREAD_FLAGS)
AC_OUTPUT([
+gtk+.spec
Makefile
gtk-config
po/Makefile.in
projects / ~andy / gtk / blobdiff