diff -ruN abi.old/ac-helpers/abi-gtk24.m4 abi/ac-helpers/abi-gtk24.m4 --- abi.old/ac-helpers/abi-gtk24.m4 1970-01-01 01:00:00.000000000 +0100 +++ abi/ac-helpers/abi-gtk24.m4 2004-04-17 21:25:04.000000000 +0200 @@ -0,0 +1,54 @@ +# start: abi/ac-helpers/abi-gtk24.m4 +# +# Copyright (C) 2002-2003 AbiSource, Inc +# +# This file is free software; you may copy and/or distribute it with +# or without modifications, as long as this notice is preserved. +# This software is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even +# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. +# +# The above license applies to THIS FILE ONLY, the abiword code +# itself may be copied and distributed under the terms of the GNU +# GPL, see COPYING for more details +# +# This file detects which of the AbiWord platforms we are currently +# building on. The detection logic in question is mostly by Jeff +# Hostetler, and is taken from the original AbiWord build system. +# +# Usage: ABI_GTK24 + +AC_DEFUN([ABI_GTK24], [ + + +gtk24=false + +AC_ARG_ENABLE(gtk24,[ --enable-gtk24 Make use of gtk+-2.4 specific functions ],[ + if test "x$enableval" = "xyes"; then + if test "$PLATFORM" != unix; then + AC_MSG_ERROR([sorry: --enable-gtk24 supported only on UNIX platforms]) + fi + gtk24=true + fi +]) + +if test "$gtk24" = true ; then + + PKG_CHECK_MODULES(GTK24,[ + glib-2.0 >= 2.4.0 + gtk+-2.0 >= 2.4.0 + pango >= 1.4.0 + ]) + + GTK_CFLAGS="$GTK_CFLAGS -DHAVE_GTK24=1" +fi + +AC_SUBST(GTK_CFLAGS) + +AM_CONDITIONAL(WITH_GTK24, test "x$gtk24" = "xtrue") + +]) +# +# end: abi/ac-helpers/abi-gtk24.m4 +# diff -ruN abi.old/configure.ac abi/configure.ac --- abi.old/configure.ac 2004-04-17 21:23:29.000000000 +0200 +++ abi/configure.ac 2004-04-17 21:11:06.000000000 +0200 @@ -121,6 +121,7 @@ dnl ./configure command line arguments dnl currently, we have: dnl --enable-gnome +dnl --enable-gtk24 dnl --enable-debug dnl --enable-extra-optimization dnl --enable-profile @@ -131,6 +132,8 @@ dnl The defined values are used mostly in includes.mk, but also in dnl some other places +dnl must be before ABI_GNOME_QUICK +ABI_GTK24 ABI_GNOME_QUICK ABI_GUCHARMAP @@ -489,6 +492,11 @@ AC_MSG_RESULT([Configured with GNOME support.]) ;; esac +case "$gtk24" in + "true" ) + AC_MSG_RESULT([Configured with gtk+-2.4 support.]) ;; +esac + case "$debug" in "true" ) AC_MSG_RESULT([Configured with debugging symbols.]) ;;