This is simply the modern recommended name. (As a side note, it also selects the right syntax coloring because .ac tells more than .in.) Signed-off-by: Jan Engelhardt <jengelh@xxxxxxx> --- configure.ac | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 119 ---------------------------------------------------------- 2 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..664c0e9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,119 @@ +AC_INIT(include/libxfs.h) +AC_PREREQ(2.50) +AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADER(include/platform_defs.h) +AC_PREFIX_DEFAULT(/usr) + +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(shared, +[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, + enable_shared=yes) +AC_SUBST(enable_shared) + +AC_ARG_ENABLE(gettext, +[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +AC_SUBST(enable_gettext) + +AC_ARG_ENABLE(readline, +[ --enable-readline=[yes/no] Enable readline command editing [default=no]], + test $enable_readline = yes && libreadline="-lreadline", + enable_readline=no) +AC_SUBST(libreadline) +AC_SUBST(enable_readline) + +AC_ARG_ENABLE(editline, +[ --enable-editline=[yes/no] Enable editline command editing [default=no]], + test $enable_editline = yes && libeditline="-ledit", + enable_editline=no) +AC_SUBST(libeditline) +AC_SUBST(enable_editline) + +AC_ARG_ENABLE(termcap, +[ --enable-termcap=[yes/no] Enable terminal capabilities library [default=no]], + test $enable_termcap = yes && libtermcap="-ltermcap",) +AC_SUBST(libtermcap) + +# AC_HAVE_BLKID_TOPO below wil find the library & check for topo support +AC_ARG_ENABLE(blkid, +[ --enable-blkid=[yes/no] Enable block device id library [default=yes]],, + enable_blkid=yes) + +AC_ARG_ENABLE(lib64, +[ --enable-lib64=[yes/no] Enable lib64 support [default=yes]],, + enable_lib64=yes) +AC_SUBST(enable_lib64) + +# +# If the user specified a libdir ending in lib64 do not append another +# 64 to the library names. +# +base_libdir=`basename "$libdir"` +case $base_libdir in +lib64) + enable_lib64=no +esac + +# +# Some important tools should be installed into the root partitions. +# +# Check whether exec_prefix=/usr: and install them to /sbin in that +# case. If the user choses a different prefix assume he just wants +# a local install for testing and not a system install. +# +case $exec_prefix:$prefix in +NONE:NONE | NONE:/usr | /usr:*) + root_sbindir='/sbin' + root_libdir="/${base_libdir}" + ;; +*) + root_sbindir="${sbindir}" + root_libdir="${libdir}" + ;; +esac + +AC_SUBST([root_sbindir]) +AC_SUBST([root_libdir]) + +# Find localized files. Don't descend into any "dot directories" +# (like .git or .pc from quilt). Strangely, the "-print" argument +# to "find" is required, to avoid including such directories in the +# list. +LOCALIZED_FILES="" +for lfile in `find ${srcdir} -path './.??*' -prune -o -name '*.c' -type f -print || exit 1`; do + LOCALIZED_FILES="$LOCALIZED_FILES \$(TOPDIR)/$lfile" +done +AC_SUBST(LOCALIZED_FILES) + +AC_PACKAGE_GLOBALS(xfsprogs) +AC_PACKAGE_UTILITIES(xfsprogs) +AC_MULTILIB($enable_lib64) + +AC_PACKAGE_NEED_AIO_H +AC_PACKAGE_NEED_LIO_LISTIO + +AC_PACKAGE_NEED_UUID_H +AC_PACKAGE_NEED_UUIDCOMPARE + +AC_PACKAGE_NEED_PTHREAD_H +AC_PACKAGE_NEED_PTHREADMUTEXINIT + +AC_HAVE_FADVISE +AC_HAVE_MADVISE +AC_HAVE_MINCORE +AC_HAVE_SENDFILE +AC_HAVE_GETMNTENT +AC_HAVE_GETMNTINFO +AC_HAVE_FALLOCATE +AC_HAVE_FIEMAP +AC_HAVE_BLKID_TOPO($enable_blkid) + +AC_TYPE_PSINT +AC_TYPE_PSUNSIGNED +AC_TYPE_U32 +AC_SIZEOF_POINTERS_AND_LONG +AC_MANUAL_FORMAT + +AC_OUTPUT(include/builddefs) diff --git a/configure.in b/configure.in deleted file mode 100644 index 664c0e9..0000000 --- a/configure.in +++ /dev/null @@ -1,119 +0,0 @@ -AC_INIT(include/libxfs.h) -AC_PREREQ(2.50) -AC_CONFIG_AUX_DIR([.]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADER(include/platform_defs.h) -AC_PREFIX_DEFAULT(/usr) - -AC_PROG_LIBTOOL - -AC_ARG_ENABLE(shared, -[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, - enable_shared=yes) -AC_SUBST(enable_shared) - -AC_ARG_ENABLE(gettext, -[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, - enable_gettext=yes) -AC_SUBST(enable_gettext) - -AC_ARG_ENABLE(readline, -[ --enable-readline=[yes/no] Enable readline command editing [default=no]], - test $enable_readline = yes && libreadline="-lreadline", - enable_readline=no) -AC_SUBST(libreadline) -AC_SUBST(enable_readline) - -AC_ARG_ENABLE(editline, -[ --enable-editline=[yes/no] Enable editline command editing [default=no]], - test $enable_editline = yes && libeditline="-ledit", - enable_editline=no) -AC_SUBST(libeditline) -AC_SUBST(enable_editline) - -AC_ARG_ENABLE(termcap, -[ --enable-termcap=[yes/no] Enable terminal capabilities library [default=no]], - test $enable_termcap = yes && libtermcap="-ltermcap",) -AC_SUBST(libtermcap) - -# AC_HAVE_BLKID_TOPO below wil find the library & check for topo support -AC_ARG_ENABLE(blkid, -[ --enable-blkid=[yes/no] Enable block device id library [default=yes]],, - enable_blkid=yes) - -AC_ARG_ENABLE(lib64, -[ --enable-lib64=[yes/no] Enable lib64 support [default=yes]],, - enable_lib64=yes) -AC_SUBST(enable_lib64) - -# -# If the user specified a libdir ending in lib64 do not append another -# 64 to the library names. -# -base_libdir=`basename "$libdir"` -case $base_libdir in -lib64) - enable_lib64=no -esac - -# -# Some important tools should be installed into the root partitions. -# -# Check whether exec_prefix=/usr: and install them to /sbin in that -# case. If the user choses a different prefix assume he just wants -# a local install for testing and not a system install. -# -case $exec_prefix:$prefix in -NONE:NONE | NONE:/usr | /usr:*) - root_sbindir='/sbin' - root_libdir="/${base_libdir}" - ;; -*) - root_sbindir="${sbindir}" - root_libdir="${libdir}" - ;; -esac - -AC_SUBST([root_sbindir]) -AC_SUBST([root_libdir]) - -# Find localized files. Don't descend into any "dot directories" -# (like .git or .pc from quilt). Strangely, the "-print" argument -# to "find" is required, to avoid including such directories in the -# list. -LOCALIZED_FILES="" -for lfile in `find ${srcdir} -path './.??*' -prune -o -name '*.c' -type f -print || exit 1`; do - LOCALIZED_FILES="$LOCALIZED_FILES \$(TOPDIR)/$lfile" -done -AC_SUBST(LOCALIZED_FILES) - -AC_PACKAGE_GLOBALS(xfsprogs) -AC_PACKAGE_UTILITIES(xfsprogs) -AC_MULTILIB($enable_lib64) - -AC_PACKAGE_NEED_AIO_H -AC_PACKAGE_NEED_LIO_LISTIO - -AC_PACKAGE_NEED_UUID_H -AC_PACKAGE_NEED_UUIDCOMPARE - -AC_PACKAGE_NEED_PTHREAD_H -AC_PACKAGE_NEED_PTHREADMUTEXINIT - -AC_HAVE_FADVISE -AC_HAVE_MADVISE -AC_HAVE_MINCORE -AC_HAVE_SENDFILE -AC_HAVE_GETMNTENT -AC_HAVE_GETMNTINFO -AC_HAVE_FALLOCATE -AC_HAVE_FIEMAP -AC_HAVE_BLKID_TOPO($enable_blkid) - -AC_TYPE_PSINT -AC_TYPE_PSUNSIGNED -AC_TYPE_U32 -AC_SIZEOF_POINTERS_AND_LONG -AC_MANUAL_FORMAT - -AC_OUTPUT(include/builddefs) -- 1.7.7 _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs