# set glib_binary_age _and_ glib_interface_age to 0.
#
m4_define([glib_major_version], [2])
-m4_define([glib_minor_version], [23])
-m4_define([glib_micro_version], [4])
+m4_define([glib_minor_version], [25])
+m4_define([glib_micro_version], [9])
m4_define([glib_interface_age], [0])
m4_define([glib_binary_age],
[m4_eval(100 * glib_minor_version + glib_micro_version)])
# check for header files
AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h])
AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
-AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h])
+AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
AC_CHECK_HEADERS([sys/uio.h])
AC_MSG_RESULT(unsigned $glib_size_type)
# Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk)
+AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk memmem)
AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo)
# Check for high-resolution sleep functions
AC_CHECK_FUNCS(nanosleep nsleep)
+AC_CHECK_FUNCS(splice)
AC_CHECK_HEADERS(crt_externs.h)
AC_CHECK_FUNCS(_NSGetEnviron)
AC_MSG_RESULT($have_eilseq)
dnl ******************************************************************
-dnl *** Look for glib-genmarshal in PATH if we are cross-compiling ***
+dnl *** If we are cross-compiling, look for glib-genmarshal and ***
+dnl *** glib-compile-schemas in PATH ***
dnl ******************************************************************
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
if test x$GLIB_GENMARSHAL = xno; then
AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
fi
+
+ AC_PATH_TOOL(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
+ if test x$GLIB_COMPILE_SCHEMAS = xno; then
+ AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
+ fi
fi
dnl **************************
AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+dnl
+dnl Tracing
+dnl
+
+AC_ARG_ENABLE([dtrace],
+ [AS_HELP_STRING([--enable-dtrace],
+ [Enable inclusion of dtrace trace support])])
+have_dtrace=no
+AC_MSG_CHECKING([whether to include dtrace tracing support])
+if test "x$enable_dtrace" != xno; then
+ AC_MSG_RESULT([yes])
+ AC_CHECK_PROGS(DTRACE, dtrace)
+ if test -z "$DTRACE"; then
+ if test "x$enable_dtrace" = xyes; then
+ AC_MSG_ERROR([dtrace not found])
+ fi
+ fi
+ AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
+ [if test "x$enable_dtrace" = xyes; then
+ AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
+ fi])
+else
+ AC_MSG_RESULT([no])
+fi
+if test "x$have_dtrace" = xyes; then
+ AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if using dtrace probes.])
+fi
+AM_CONDITIONAL([ENABLE_DTRACE], [test x$have_dtrace = xyes ])
+
+AC_MSG_CHECKING([whether to include systemtap tracing support])
+AC_ARG_ENABLE([systemtap],
+ [AS_HELP_STRING([--enable-systemtap],
+ [Enable inclusion of systemtap trace support])])
+have_systemtap=no
+if test "x$enable_systemtap" != xno -a "x$have_dtrace" = xyes; then
+ have_systemtap=yes
+fi
+AC_MSG_RESULT(${have_systemtap})
+
+AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$have_systemtap = xyes])
+
+AC_ARG_WITH([tapset-install-dir],
+ [AS_HELP_STRING([--with-tapset-install-dir],
+ [The absolute path where the systemtap tapsets will be installed])],
+ [if test "x${withval}" = x; then
+ ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
+ else
+ ABS_TAPSET_DIR="${withval}"
+ fi],
+ [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
+AC_SUBST(ABS_TAPSET_DIR)
+
dnl ******************************
dnl *** output the whole stuff ***
dnl ******************************
fi
])
+# Check for libdbus1 - Optional - is only used in the GDBus test cases
+#
+PKG_CHECK_MODULES(DBUS1,
+ dbus-1,
+ [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
+ have_dbus1=no)
+AC_SUBST(DBUS1_CFLAGS)
+AC_SUBST(DBUS1_LIBS)
+AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
+
AC_CONFIG_FILES([
glib-2.0.pc
glib-2.0-uninstalled.pc
gobject-2.0-uninstalled.pc
gio-2.0.pc
gio-unix-2.0.pc
+gio-windows-2.0.pc
gio-2.0-uninstalled.pc
gio-unix-2.0-uninstalled.pc
glib-zip
build/Makefile
build/win32/Makefile
build/win32/dirent/Makefile
-build/win32/vs8/Makefile
build/win32/vs9/Makefile
glib/Makefile
+glib/glib.stp
glib/libcharset/Makefile
glib/gnulib/Makefile
glib/pcre/Makefile
gmodule/Makefile
gmodule/gmoduleconf.h
gobject/Makefile
+gobject/gobject.stp
gobject/glib-mkenums
gobject/tests/Makefile
gthread/Makefile