From: Anatol Pomozov Date: Sun, 3 Feb 2013 01:32:46 +0000 (-0800) Subject: libfuse: rename ./configure.in to ./configure.ac X-Git-Tag: fuse_2_9_3~5 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eb385fbe931838ffd17c523cde4303059c1c8964;p=qemu-gpiodev%2Flibfuse.git libfuse: rename ./configure.in to ./configure.ac Next version of automake (1.14) removes support for the deprecated filename http://lists.gnu.org/archive/html/autotools-announce/2013-01/msg00000.html --- diff --git a/ChangeLog b/ChangeLog index 2f073ce..a163bd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ * libfuse: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER. Patch by Anatol Pomozov + * libfuse: rename ./configure.in to ./configure.ac. Patch by + Anatol Pomozov + 2012-10-01 Miklos Szeredi * Released 2.9.2 diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..0737bad --- /dev/null +++ b/configure.ac @@ -0,0 +1,124 @@ +AC_INIT(fuse, 2.9.2) + +AC_PREREQ(2.59d) +AC_CONFIG_MACRO_DIR([m4]) +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) +AC_CONFIG_HEADERS(include/config.h) + +AC_PROG_LIBTOOL +AC_PROG_CC +AC_PROG_MKDIR_P +AM_PROG_CC_C_O + +case $target_os in + *linux*) arch=linux;; + *netbsd*) arch=netbsd;; + *bsd*) arch=bsd;; + *) arch=unknown;; +esac + +if test "$ac_env_CFLAGS_set" != set; then + CFLAGS="-Wall -W -Wno-sign-compare -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings -g -O2 -fno-strict-aliasing" +fi + +AC_ARG_ENABLE(lib, + [ --enable-lib Compile with library ]) +AC_ARG_ENABLE(util, + [ --enable-util Compile with util ]) +AC_ARG_ENABLE(example, + [ --enable-example Compile with examples ]) +AC_ARG_ENABLE(mtab, + [ --disable-mtab Disable and ignore usage of /etc/mtab ]) + +AC_ARG_WITH(pkgconfigdir, + [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], + [pkgconfigdir=$withval], + [pkgconfigdir='${libdir}/pkgconfig']) +AC_SUBST(pkgconfigdir) + +subdirs2="include" + +if test "$enable_lib" != "no"; then + subdirs2="$subdirs2 lib"; +fi +if test "$arch" = linux -a "$enable_util" != "no"; then + subdirs2="$subdirs2 util"; +fi +if test "$enable_example" != "no"; then + subdirs2="$subdirs2 example"; +fi +if test "$enable_mtab" = "no"; then + AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab]) +fi + +AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) +AC_CHECK_FUNCS([posix_fallocate]) +AC_CHECK_MEMBERS([struct stat.st_atim]) +AC_CHECK_MEMBERS([struct stat.st_atimespec]) + +LIBS= +AC_SEARCH_LIBS(dlopen, [dl]) +AC_SEARCH_LIBS(clock_gettime, [rt]) +libfuse_libs=$LIBS +LIBS= +AC_ARG_WITH([libiconv-prefix], +[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done + ]) +AM_ICONV +libfuse_libs="$libfuse_libs $LTLIBICONV" +AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes) +AC_SUBST(libfuse_libs) + +if test -z "$MOUNT_FUSE_PATH"; then + MOUNT_FUSE_PATH=/sbin +fi +AC_SUBST(MOUNT_FUSE_PATH) +if test -z "$UDEV_RULES_PATH"; then + UDEV_RULES_PATH=/etc/udev/rules.d +fi +AC_SUBST(UDEV_RULES_PATH) +if test -z "$INIT_D_PATH"; then + INIT_D_PATH=/etc/init.d +fi +AC_SUBST(INIT_D_PATH) + +AC_SUBST(subdirs2) + +AM_CONDITIONAL(LINUX, test "$arch" = linux) +AM_CONDITIONAL(NETBSD, test "$arch" = netbsd) +AM_CONDITIONAL(BSD, test "$arch" = bsd) + +util_linux_ok=yes +if test "$arch" = linux -a "$cross_compiling" != "yes"; then + AC_MSG_CHECKING([if umount supports --fake --no-canonicalize]) + # exit code of umount is 1 if option is unrecognised, 2 otherwise + umount --fake --no-canonicalize > /dev/null 2>&1 + if test $? != 1; then + AC_MSG_RESULT([yes]) + else + firstline=`umount --fake --no-canonicalize 2>&1 | head -1` + if test "$firstline" = 'umount: only root can use "--fake" option'; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([$firstline]) + util_linux_ok=no + fi + fi +fi + +AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile]) +AC_OUTPUT + +if test "$util_linux_ok" = no; then + AC_MSG_WARN([ +****************************************************************** +* Please install util-linux version 2.18 or later which supports * +* --fake and --no-canonicalize options in mount and umount * +******************************************************************]) +fi diff --git a/configure.in b/configure.in deleted file mode 100644 index 0737bad..0000000 --- a/configure.in +++ /dev/null @@ -1,124 +0,0 @@ -AC_INIT(fuse, 2.9.2) - -AC_PREREQ(2.59d) -AC_CONFIG_MACRO_DIR([m4]) -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) -AC_CONFIG_HEADERS(include/config.h) - -AC_PROG_LIBTOOL -AC_PROG_CC -AC_PROG_MKDIR_P -AM_PROG_CC_C_O - -case $target_os in - *linux*) arch=linux;; - *netbsd*) arch=netbsd;; - *bsd*) arch=bsd;; - *) arch=unknown;; -esac - -if test "$ac_env_CFLAGS_set" != set; then - CFLAGS="-Wall -W -Wno-sign-compare -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings -g -O2 -fno-strict-aliasing" -fi - -AC_ARG_ENABLE(lib, - [ --enable-lib Compile with library ]) -AC_ARG_ENABLE(util, - [ --enable-util Compile with util ]) -AC_ARG_ENABLE(example, - [ --enable-example Compile with examples ]) -AC_ARG_ENABLE(mtab, - [ --disable-mtab Disable and ignore usage of /etc/mtab ]) - -AC_ARG_WITH(pkgconfigdir, - [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], - [pkgconfigdir=$withval], - [pkgconfigdir='${libdir}/pkgconfig']) -AC_SUBST(pkgconfigdir) - -subdirs2="include" - -if test "$enable_lib" != "no"; then - subdirs2="$subdirs2 lib"; -fi -if test "$arch" = linux -a "$enable_util" != "no"; then - subdirs2="$subdirs2 util"; -fi -if test "$enable_example" != "no"; then - subdirs2="$subdirs2 example"; -fi -if test "$enable_mtab" = "no"; then - AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab]) -fi - -AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) -AC_CHECK_FUNCS([posix_fallocate]) -AC_CHECK_MEMBERS([struct stat.st_atim]) -AC_CHECK_MEMBERS([struct stat.st_atimespec]) - -LIBS= -AC_SEARCH_LIBS(dlopen, [dl]) -AC_SEARCH_LIBS(clock_gettime, [rt]) -libfuse_libs=$LIBS -LIBS= -AC_ARG_WITH([libiconv-prefix], -[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - ]) -AM_ICONV -libfuse_libs="$libfuse_libs $LTLIBICONV" -AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes) -AC_SUBST(libfuse_libs) - -if test -z "$MOUNT_FUSE_PATH"; then - MOUNT_FUSE_PATH=/sbin -fi -AC_SUBST(MOUNT_FUSE_PATH) -if test -z "$UDEV_RULES_PATH"; then - UDEV_RULES_PATH=/etc/udev/rules.d -fi -AC_SUBST(UDEV_RULES_PATH) -if test -z "$INIT_D_PATH"; then - INIT_D_PATH=/etc/init.d -fi -AC_SUBST(INIT_D_PATH) - -AC_SUBST(subdirs2) - -AM_CONDITIONAL(LINUX, test "$arch" = linux) -AM_CONDITIONAL(NETBSD, test "$arch" = netbsd) -AM_CONDITIONAL(BSD, test "$arch" = bsd) - -util_linux_ok=yes -if test "$arch" = linux -a "$cross_compiling" != "yes"; then - AC_MSG_CHECKING([if umount supports --fake --no-canonicalize]) - # exit code of umount is 1 if option is unrecognised, 2 otherwise - umount --fake --no-canonicalize > /dev/null 2>&1 - if test $? != 1; then - AC_MSG_RESULT([yes]) - else - firstline=`umount --fake --no-canonicalize 2>&1 | head -1` - if test "$firstline" = 'umount: only root can use "--fake" option'; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([$firstline]) - util_linux_ok=no - fi - fi -fi - -AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile]) -AC_OUTPUT - -if test "$util_linux_ok" = no; then - AC_MSG_WARN([ -****************************************************************** -* Please install util-linux version 2.18 or later which supports * -* --fake and --no-canonicalize options in mount and umount * -******************************************************************]) -fi