#
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"
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"
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
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)
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)
if $dynworks; then
AC_DEFINE(USE_GMODULE)
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags 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)
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.)
use_mmx_asm=yes
fi
+ rm -rf conftest*
+
ac_ext=$save_ac_ext
if test $use_mmx_asm = yes; then
AC_DEFINE(USE_MMX)
##################################################
-# Checks for gtk-doc
+# 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)
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
+gtk/gtk-win32.rc
+gtk/stock-icons/Makefile
modules/Makefile
modules/linux-fb/Makefile
-], [chmod +x gtk-config])
+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