#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=3
-GTK_MICRO_VERSION=0
+GTK_MICRO_VERSION=2
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
+#
+# gdk-pixbuf gets versioned separately, and for now, using standard
+# libtool versioning, not GTK+-style versioning
+#
+GDK_PIXBUF_MAJOR=0
+GDK_PIXBUF_MINOR=8
+GDK_PIXBUF_MICRO=0
+GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
+AC_SUBST(GDK_PIXBUF_MAJOR)
+AC_SUBST(GDK_PIXBUF_MINOR)
+AC_SUBST(GDK_PIXBUF_MICRO)
+AC_SUBST(GDK_PIXBUF_VERSION)
+
# For automake.
VERSION=$GTK_VERSION
PACKAGE=gtk+
+GETTEXT_PACKAGE=gtk20
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
gdktarget=x11
-gdktargetlib=libgdk-x11.la
-gtktargetlib=libgtk-x11.la
+gdktargetlib=libgdk-x11-1.3.la
+gtktargetlib=libgtk-x11-1.3.la
AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/nanox/linux-fb] select GDK target [default=x11] ],
gdktarget=$with_gdktarget)
fi
AC_SUBST(REBUILD)
-AC_CHECK_FUNCS(lstat)
+AC_CHECK_FUNCS(lstat mkstemp sigsetjmp bind_textdomain_codeset)
AC_MSG_CHECKING(whether make is GNU Make)
STRIP_BEGIN=
AC_SUBST(STRIP_END)
# i18n stuff
-ALL_LINGUAS="ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk wa zh_TW.Big5 zh_CN.GB2312"
+ALL_LINGUAS="ca cs da de el en_GB en@IPA es et eu fa fi fr ga gl he hr hu ia it ja ko lt nl no pl pt pt_BR ro ru sk sl sp sr sv tr uk wa zh_TW zh_CN"
AM_GTK_GNU_GETTEXT
LIBS="$LIBS $INTLLIBS"
AC_TRY_RUN([#include <math.h>
int main (void) { return (log(1) != log(1.)); }],
AC_MSG_RESULT(none needed),
- gtk_save_CFLAGS=$CFLAGS
+ gtk_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -std1"
AC_TRY_RUN([#include <math.h>
int main (void) { return (log(1) != log(1.)); }],
AC_MSG_RESULT(-std1),
AC_MSG_RESULT()
- CFLAGS=$gtk_save_CFLAGS
+ CFLAGS="$gtk_save_CFLAGS"
AC_MSG_WARN(
[No ANSI prototypes found in library. (-std1 didn't work.)]),
true
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
+ 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
+ CFLAGS="$gtk_save_CFLAGS"
AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
if test x$with_glib = xyes ; then
if test x$with_glib = x ; then
# Look for separately installed glib
- AM_PATH_GLIB(1.3.1,,
+ AM_PATH_GLIB_2_0(1.3.1,,
AC_MSG_ERROR([
-*** GLIB 1.3.0 or better is required. The latest version of GLIB
+*** GLIB 1.3.1 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org/.]),
gobject gmodule gthread)
# we do not want to make all gtk progs to link to thread libraries.
- glib_cflags=`$GLIB_CONFIG glib gobject gmodule --cflags`
+ glib_cflags=`$GLIB_CONFIG_2_0 glib gobject gmodule --cflags`
glib_thread_cflags="$GLIB_CFLAGS"
- glib_libs=`$GLIB_CONFIG glib gobject gmodule --libs`
+ glib_libs=`$GLIB_CONFIG_2_0 glib gobject 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)
- GLIB_CONFIG=$with_glib/glib-config
- if test -x $GLIB_CONFIG ; then
+ GLIB_CONFIG_2_0=$with_glib/glib-config-2.0
+ if test -x $GLIB_CONFIG_2_0 ; then
:
else
AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured])
fi
# For use in gtk-config
- 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_cflags=`$GLIB_CONFIG_2_0 --cflags gmodule`
+ glib_thread_cflags=`$GLIB_CONFIG_2_0 --cflags gmodule gthread`
+ glib_libs=`$GLIB_CONFIG_2_0 --libs gmodule`
+ glib_thread_libs=`$GLIB_CONFIG_2_0 --libs gmodule gthread`
- glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
+ glib_release=`$GLIB_CONFIG_2_0 --version | sed 's%\\.[[0-9]]*$%%'`
# canonicalize relative paths
case $with_glib in
esac
GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
- GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la"
+ GLIB_LIBS="$glib_dir/libglib-1.3.la $glib_dir/gmodule/libgmodule-1.3.la"
GLIB_DEPLIBS=
AC_SUBST(GLIB_CFLAGS)
AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H))
AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
+AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
+
+saved_cflags="$CFLAGS"
+saved_ldflags="$LDFLAGS"
if test "x$gdktarget" = "xx11"; then
# Find the X11 include and library directories
x_includes="/usr/include"
fi
- saved_cflags="$CFLAGS"
- saved_ldflags="$LDFLAGS"
-
CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
more_includes="$x_includes"
# these are already defined above
- #gdktargetlib = "libgdk-x11.la"
- #gtktargetlib = "libgtk-x11.la"
+ #gdktargetlib = "libgdk-x11-1.3.la"
+ #gtktargetlib = "libgtk-x11-1.3.la"
AM_CONDITIONAL(USE_X11, true)
+else
+ AM_CONDITIONAL(USE_X11, false)
fi
if test "x$gdktarget" = "xnanox"; then
more_libs="-lnano-X"
more_includes=
- gdktargetlib = "libgdk-nanox.la"
- gtktargetlib = "libgtk-nanox.la"
+ gdktargetlib="libgdk-nanox-1.3.la"
+ gtktargetlib="libgtk-nanox-1.3.la"
with_xinput=no
AC_DEFINE(XINPUT_NONE)
x_libs=
xinput_progs=
AM_CONDITIONAL(USE_NANOX, true)
+else
+ AM_CONDITIONAL(USE_NANOX, false)
fi
if test "x$gdktarget" = "xlinux-fb"; then
more_libs=
more_includes=
- gdktargetlib = "libgdk-linux-fb.la"
- gtktargetlib = "libgtk-linux-fb.la"
+ gdktargetlib="libgdk-linux-fb-1.3.la"
+ gtktargetlib="libgtk-linux-fb-1.3.la"
with_xinput=no
AC_DEFINE(XINPUT_NONE)
xinput_progs=
AM_CONDITIONAL(USE_LINUX_FB, true)
+else
+ AM_CONDITIONAL(USE_LINUX_FB, false)
fi
#
if test x$PANGO_CONFIG = xno ; then
AC_MSG_ERROR([*** pango-config not found])
fi
-PANGO_CFLAGS="`pango-config --cflags pangox`"
+
+if test "x$gdktarget" = "xx11"; then
+ PANGO_CFLAGS="`$PANGO_CONFIG --cflags pangox`"
+ PANGO_LIBS="`$PANGO_CONFIG --libs pangox`"
+else
+ PANGO_CFLAGS="`$PANGO_CONFIG --cflags pango`"
+ PANGO_LIBS="`$PANGO_CONFIG --libs pango`"
+fi
CFLAGS="$CFLAGS $PANGO_CFLAGS"
-PANGO_LIBS="`pango-config --libs pangox`"
AC_SUBST(PANGO_LIBS)
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(GTK_XIM_FLAGS)
AC_SUBST(GTK_LOCALE_FLAGS)
+##################################################
+# Checks for gdk-pixbuf
+##################################################
+
+AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
+
+AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[
+ if test x$withval = xyes; then
+ with_modules=yes
+ else
+ with_modules=no
+ fi
+])
+
+dynworks=false
+deps=
+if test x$with_modules = xno; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(whether dynamic modules work)
+ oLIBS="$LIBS"
+ oCFLAGS="$CFLAGS"
+ CFLAGS="$GLIB_CFLAGS"
+ LIBS="$GLIB_LIBS"
+ AC_TRY_RUN([
+ #include <glib.h>
+ #include <gmodule.h>
+ main ()
+ {
+ if (g_module_supported ())
+ exit (0);
+ else
+ exit (1);
+ }
+ ], dynworks=true)
+ LIBS="$oLIBS"
+ CFLAGS="$oCFLAGS"
+fi
+
+dnl Now we check to see if our libtool supports shared lib deps
+dnl (in a rather ugly way even)
+if $dynworks; then
+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
+ pixbuf_deplibs_check=`$pixbuf_libtool_config | \
+ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
+ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
+ if test "x$pixbuf_deplibs_check" = "xnone" || \
+ test "x$pixbuf_deplibs_check" = "xunknown" || \
+ test "x$pixbuf_deplibs_check" = "x"; then
+ dynworks=false
+ fi
+fi
+
+if $dynworks; then
+ AC_DEFINE(USE_GMODULE)
+ GMODULE_LIBS="`$GLIB_CONFIG_2_0 --libs gmodule`"
+ GMODULE_FLAGS="`$GLIB_CONFIG_2_0 --cflags gmodule`"
+ AC_SUBST(GMODULE_LIBS)
+ AC_SUBST(GMODULE_FLAGS)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
+dnl Test for libtiff
+ if test -z "$LIBTIFF"; then
+ AC_CHECK_LIB(tiff, TIFFReadScanline,
+ AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
+ AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
+ AC_CHECK_LIB(tiff34, TIFFFlushData,
+ AC_CHECK_HEADER(tiffio.h,
+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
+ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
+ fi
+
+dnl Test for libjpeg
+ if test -z "$LIBJPEG"; then
+ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+ jpeg_ok=yes,
+ jpeg_ok=no
+ AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
+ if test "$jpeg_ok" = yes; then
+ AC_MSG_CHECKING([for jpeglib.h])
+ AC_TRY_CPP(
+[#include <stdio.h>
+#undef PACKAGE
+#undef VERSION
+#include <jpeglib.h>],
+ jpeg_ok=yes,
+ jpeg_ok=no)
+ AC_MSG_RESULT($jpeg_ok)
+ if test "$jpeg_ok" = yes; then
+ LIBJPEG='-ljpeg'
+ AC_CHECK_LIB(jpeg, jpeg_simple_progression,
+ AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
+ AC_MSG_WARN(JPEG library does not support progressive saving.))
+ else
+ AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
+ fi
+ fi
+ fi
+
+dnl Test for libpng
+ if test -z "$LIBPNG"; then
+ AC_CHECK_LIB(png, png_read_info,
+ AC_CHECK_HEADER(png.h,
+ png_ok=yes,
+ png_ok=no),
+ AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
+ if test "$png_ok" = yes; then
+ AC_MSG_CHECKING([for png_structp in png.h])
+ AC_TRY_COMPILE([#include <png.h>],
+ [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
+ png_ok=yes,
+ png_ok=no)
+ AC_MSG_RESULT($png_ok)
+ if test "$png_ok" = yes; then
+ PNG='png'; LIBPNG='-lpng -lz'
+ else
+ AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
+ fi
+ else
+ AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
+ fi
+ fi
+
+deps="$LIBTIFF $LIBJPEG $LIBPNG"
+
+AC_SUBST(LIBTIFF)
+AC_SUBST(LIBJPEG)
+AC_SUBST(LIBPNG)
+
+AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
+
+AC_HEADER_STDC
+AC_HEADER_DIRENT
+AC_HEADER_SYS_WAIT
+
+AC_TYPE_SIGNAL
+
+AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
+AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+
+GDK_PIXBUF_LIBDIR='-L${libdir}'
+GDK_PIXBUF_INCLUDEDIR="-I${includedir} $GTK_CFLAGS"
+GDK_PIXBUF_LIBS="$GLIB_LIBS -lgdk_pixbuf $deps $GTK_LIBS"
+AC_SUBST(STATIC_LIB_DEPS)
+STATIC_LIB_DEPS="$deps"
+
+AC_SUBST(GDK_PIXBUF_LIBDIR)
+AC_SUBST(GDK_PIXBUF_INCLUDEDIR)
+AC_SUBST(GDK_PIXBUF_LIBS)
+
+GDK_PIXBUF_XLIB_LIBDIR=$GDK_PIXBUF_LIBDIR
+GDK_PIXBUF_XLIB_INCLUDEDIR=$GDK_PIXBUF_INCLUDEDIR
+GDK_PIXBUF_XLIB_LIBS="$GLIB_LIBS -lgdk_pixbuf_xlib $deps $X11_LIBS"
+
+AC_SUBST(GDK_PIXBUF_XLIB_LIBDIR)
+AC_SUBST(GDK_PIXBUF_XLIB_INCLUDEDIR)
+AC_SUBST(GDK_PIXBUF_XLIB_LIBS)
+
+# Checks to see if we should compile in MMX support (there will be
+# a runtime test when the code is actually run to see if it should
+# be used - this just checks if we can compile it.)
+#
+# This code is partially taken from Mesa
+#
+AC_MSG_CHECKING(for x86 platform)
+case $host_cpu in
+ i386|i486|i586|i686|i786|k6|k7)
+ use_x86_asm=yes
+ ;;
+ *)
+ use_x86_asm=no
+esac
+AC_MSG_RESULT($use_x86_asm)
+
+use_mmx_asm=no
+if test $use_x86_asm = yes; then
+ save_ac_ext=$ac_ext
+ ac_ext=S
+
+ AC_MSG_CHECKING(compiler support for MMX)
+ cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
+ if AC_TRY_EVAL(ac_compile); then
+ use_mmx_asm=yes
+ fi
+
+ rm -rf conftest*
+
+ ac_ext=$save_ac_ext
+ if test $use_mmx_asm = yes; then
+ AC_DEFINE(USE_MMX)
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+fi
+
+AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
+
+
+##################################################
+# Checks for gtk-doc and docbook-tools
+##################################################
+
+AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+ HTML_DIR='${datadir}/gtk-doc/html'
+else
+ HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
+AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
+AC_SUBST(HAVE_GTK_DOC)
+
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
+dnl Let people disable the gtk-doc stuff.
+AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
+
+if test x$enable_gtk_doc = xauto ; then
+ if test x$GTKDOC = xtrue ; then
+ enable_gtk_doc=yes
+ else
+ enable_gtk_doc=no
+ fi
+fi
+
+dnl NOTE: We need to use a separate automake conditional for this
+dnl to make this work with the tarballs.
+AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+
+GDK_PIXBUF_DIR=`(cd $srcdir; pwd)`
+AC_SUBST(GDK_PIXBUF_DIR)
+
+
+##################################################
+# Output commands
+##################################################
+
AC_OUTPUT_COMMANDS([
## Generate `gdk/gdkconfig.h' in two cases
#define GDK_WINDOWING_NANOX'
elif test "x$gdktarget" = "xlinux-fb" ; then
gdk_windowing='
-#define GDK_WINDOWING_FB'
+#define GDK_WINDOWING_FB
+#define GDK_NATIVE_WINDOW_POINTER'
fi
if test x$gdk_wchar_h = xyes; then
gtk+.spec
docs/gtk-config.1
Makefile
-gtk-config
+gtk-config-2.0
+gdk-pixbuf-2.0.pc
+gdk-2.0.pc
+gtk+-2.0.pc
po/Makefile.in
+build/Makefile
+build/win32/Makefile
+demos/Makefile
+demos/gtk-demo/Makefile
docs/Makefile
+docs/reference/Makefile
+docs/reference/gdk-pixbuf/Makefile
+docs/reference/gdk/Makefile
+docs/reference/gtk/Makefile
+docs/faq/Makefile
+docs/tutorial/Makefile
+gdk-pixbuf/Makefile
+gdk-pixbuf/makefile.mingw
+gdk-pixbuf/gdk-pixbuf-features.h
+gdk-pixbuf/pixops/Makefile
+gdk-pixbuf/pixops/makefile.mingw
gdk/Makefile
+gdk/makefile.mingw
gdk/x11/Makefile
gdk/win32/Makefile
+gdk/win32/makefile.mingw
+gdk/win32/rc/Makefile
+gdk/win32/rc/gdk.rc
gdk/nanox/Makefile
gdk/linux-fb/Makefile
gtk/Makefile
-gtk/gtkfeatures.h
+gtk/makefile.mingw
+gtk/makefile.msc
gtk/gtkcompat.h
-], [chmod +x gtk-config])
+gtk/gtk-win32.rc
+gtk/stock-icons/Makefile
+modules/Makefile
+modules/linux-fb/Makefile
+modules/input/Makefile
+contrib/Makefile
+contrib/gdk-pixbuf-xlib/Makefile
+contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
+], [chmod +x gtk-config-2.0])
projects / ~andy / gtk / blobdiff