#
m4_define([glib_major_version], [2])
m4_define([glib_minor_version], [25])
-m4_define([glib_micro_version], [13])
+m4_define([glib_micro_version], [16])
m4_define([glib_interface_age], [0])
m4_define([glib_binary_age],
[m4_eval(100 * glib_minor_version + glib_micro_version)])
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CPP
+
AC_CANONICAL_HOST
AC_MSG_CHECKING([for the BeOS])
AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-
dnl Check for a working C++ compiler, but do not bail out, if none is found.
AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], [gcc])
AC_LANG_SAVE
AC_SYS_LARGEFILE
-#
-# Find pkg-config
-#
-AC_PATH_PROG(PKG_CONFIG, [pkg-config], [no])
-if test x$PKG_CONFIG = xno ; then
- AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
-fi
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.16 ; then
- :
-else
- AC_MSG_ERROR([*** pkg-config too old; version 0.16 or better required.])
-fi
+PKG_PROG_PKG_CONFIG(0.16)
if test "x$enable_debug" = "xyes"; then
if test x$cflags_set != xset ; then
#endif])
# struct statvfs.f_basetype is available on Solaris but not for Linux.
AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [#include <sys/statvfs.h>])
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff])
# Checks for libcharset
AM_LANGINFO_CODESET
AC_SUBST(GLIB_LINK_FLAGS)
+#
+# Define variables corresponding to the correct include paths to use for
+# in-tree building.
+#
+
+# for config.h:
+config_h_INCLUDES='-I$(top_builddir)'
+AC_SUBST(config_h_INCLUDES)
+
+# glib:
+# config.h
+# $(top_builddir)/glib: for glibconfig.h
+# $(top_srcdir)/glib: for glib.h
+# $(top_srcdir): for everything
+glib_INCLUDES='$(config_h_INCLUDES) -I$(top_builddir)/glib -I$(top_srcdir)/glib -I$(top_srcdir)'
+AC_SUBST(glib_INCLUDES)
+
+# gthread:
+# same as glib
+gthread_INCLUDES='$(glib_INCLUDES)'
+AC_SUBST(gthread_INCLUDES)
+
+# gobject:
+# same as gthread
+gobject_INCLUDES='$(gthread_INCLUDES)'
+AC_SUBST(gobject_INCLUDES)
+
+# gmodule:
+# glib includes
+# $(top_srcdir)/gmodule: for gmodule.h
+gmodule_INCLUDES='$(glib_INCLUDES) -I$(top_srcdir)/gmodule'
+AC_SUBST(gmodule_INCLUDES)
+
+# gio:
+# same as gmodule
+gio_INCLUDES='$(gmodule_INCLUDES)'
+AC_SUBST(gio_INCLUDES)
+
+
AC_CONFIG_FILES([
glib-2.0.pc
glib-2.0-uninstalled.pc