X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=4652c12f16d6bdc66e13fdbe1a6b72af8bd2d73f;hb=9d7952fa6b9fba2c118601a4e74eb2d7b32cbe7c;hp=19afb02d172782a3d8c40f344d3efddcf29a4706;hpb=5bda3384fee12ffa1b008212bb7d26968741aea3;p=captive.git diff --git a/configure.in b/configure.in index 19afb02..4652c12 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ AC_INIT(src/libcaptive/Makefile-libcaptive.am) dnl 2.53 for AM_GLIB_GNU_GETTEXT: AC_PREREQ(2.53) -AM_INIT_AUTOMAKE(captive,0.9) +AM_INIT_AUTOMAKE(captive,1.0.1cvs) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE dnl Call AC_PROG_CC before AC_ISC_POSIX. @@ -371,8 +371,14 @@ AM_CONDITIONAL(ENABLE_INSTALL_PKG,[ test "xyes" = "x$BUILD_GLADESRC" ]) dnl Do not use AC_REPLACE_FUNCS() as we need to link it selectively: GNOME_VFS_READ_ENTIRE_FILE_O="" +captive_save_CFLAGS="$CFLAGS" +captive_save_LIBS="$LIBS" +CFLAGS="$CFLAGS $GNOME_VFS_MODULE_CFLAGS" +LIBS="$LIBS $GNOME_VFS_MODULE_LIBS" AC_CHECK_FUNCS(gnome_vfs_read_entire_file,, [ GNOME_VFS_READ_ENTIRE_FILE_O='gnome_vfs_read_entire_file.$(OBJEXT)' ]) +CFLAGS="$captive_save_CFLAGS" +LIBS="$captive_save_LIBS" AC_SUBST(GNOME_VFS_READ_ENTIRE_FILE_O) AC_SUBST(CFLAGS)