Menu
▾
▴
[ntfs-3g-cvs] ntfs-3g aclocal.m4, NONE, 1.1.2.1 ltmain.sh, NONE, 1.1.2.1 autogen.sh, 1.2, 1.2.2.1 configure.ac, 1.40.2.2, 1.40.2.3 Makefile.am, 1.1.1.1.2.2, 1.1.1.1.2.3
|
From: Jean-Pierre A. <jp...@us...> - 2008-09-06 14:42:57
|
Update of /cvsroot/ntfs-3g/ntfs-3g In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29905/ntfs-3g Modified Files: Tag: PERMISSION_HANDLING_BRANCH autogen.sh configure.ac Makefile.am Added Files: Tag: PERMISSION_HANDLING_BRANCH aclocal.m4 ltmain.sh Log Message: Updated files needed to make a build --- NEW FILE: aclocal.m4 --- # generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(AC_AUTOCONF_VERSION, [2.61],, [m4_warning([this file was generated for autoconf 2.61. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. [...7616 lines suppressed...] # tar/untar a dummy directory, and stop if the command works rm -rf conftest.dir mkdir conftest.dir echo GrepMe > conftest.dir/file AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) rm -rf conftest.dir if test -s conftest.tar; then AM_RUN_LOG([$am__untar <conftest.tar]) grep GrepMe conftest.dir/file >/dev/null 2>&1 && break fi done rm -rf conftest.dir AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) AC_MSG_RESULT([$am_cv_prog_tar_$1])]) AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR Index: configure.ac =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/configure.ac,v retrieving revision 1.40.2.2 retrieving revision 1.40.2.3 diff -u -d -r1.40.2.2 -r1.40.2.3 --- configure.ac 30 Jan 2008 11:03:21 -0000 1.40.2.2 +++ configure.ac 6 Sep 2008 14:42:26 -0000 1.40.2.3 @@ -3,8 +3,8 @@ # compilation. # # Copyright (c) 2000-2006 Anton Altaparmakov -# Copyright (c) 2005-2007 Szabolcs Szakacsits -# Copyright (C) 2007 Alon Bar-Lev +# Copyright (c) 2005-2008 Szabolcs Szakacsits +# Copyright (C) 2007-2008 Alon Bar-Lev # # This program/include file is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as published @@ -22,9 +22,9 @@ # Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Autoconf -AC_PREREQ([2.59]) -AC_INIT([ntfs-3g],[1.2129SR.1],[ntf...@li...]) -LIBNTFS_3G_VERSION=211 +AC_PREREQ(2.59) +AC_INIT([ntfs-3g],[1.2812],[ntf...@li...]) +LIBNTFS_3G_VERSION="36" AC_CONFIG_SRCDIR([src/ntfs-3g.c]) # Environment @@ -33,93 +33,105 @@ # Automake AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE # Options AC_ARG_ENABLE( [debug], - [AC_HELP_STRING([--enable-debug], [enable debugging code and output])], + [AS_HELP_STRING([--enable-debug],[enable debugging code and output])], , [enable_debug="no"] ) AC_ARG_ENABLE( [warnings], - [AC_HELP_STRING([--enable-warnings], [enable lots of compiler warnings])], + [AS_HELP_STRING([--enable-warnings],[enable lots of compiler warnings])], , [enable_warnings="no"] ) AC_ARG_ENABLE( [pedantic], - [AC_HELP_STRING([--enable-pedantic], [enable compile pedantic mode])], + [AS_HELP_STRING([--enable-pedantic],[enable compile pedantic mode])], , [enable_pedantic="no"] ) AC_ARG_ENABLE( [really-static], - [AC_HELP_STRING([--enable-really-static], [create fully static binaries])], + [AS_HELP_STRING([--enable-really-static],[create fully static binaries])], , [enable_really_static="no"] ) -AM_CONDITIONAL([REALLYSTATIC], [test "${enable_really_static}" = "yes"]) AC_ARG_ENABLE( - [library], - [AC_HELP_STRING([--disable-library], [do not install libntfs-3g but link it into ntfs-3g])], + [mount-helper], + [AS_HELP_STRING([--enable-mount-helper],[install mount helper @<:@default=enabled for linux@:>@])], , - [enable_library="yes"] + [ + case "${target_os}" in + linux*) enable_mount_helper="yes" ;; + *) enable_mount_helper="no" ;; + esac + ] +) + +AC_ARG_ENABLE( + [ldscript], + [AS_HELP_STRING([--enable-ldscript],[use ldscript instead of .so symlink])], + , + [enable_ldscript="no"] ) -test "${enable_really_static}" = "yes" && enable_library="no" -AM_CONDITIONAL(INSTALL_LIBRARY, test "$enable_library" = yes) AC_ARG_ENABLE( [ldconfig], - [AC_HELP_STRING([--disable-ldconfig], [do not update dynamic linker cache using ldconfig])], + [AS_HELP_STRING([--disable-ldconfig],[do not update dynamic linker cache using ldconfig])], , [enable_ldconfig="yes"] ) -test "${enable_library}" = "no" && enable_ldconfig="no" -# --disable-library will disable to run ldconfig since no point to do so. -AM_CONDITIONAL(RUN_LDCONFIG, test "$enable_ldconfig" = yes) AC_ARG_ENABLE( - [ldscript], - [AC_HELP_STRING([--enable-ldscript], [use ldscript instead of .so symlink])], + [library], + [AS_HELP_STRING([--disable-library],[do not install libntfs-3g but link it into ntfs-3g])], , - [enable_ldscript="no"] + [enable_library="yes"] ) AC_ARG_ENABLE( [mtab], - [AC_HELP_STRING([--disable-mtab], [disable and ignore usage of /etc/mtab])], + [AS_HELP_STRING([--disable-mtab],[disable and ignore usage of /etc/mtab])], , [enable_mtab="yes"] ) AC_ARG_ENABLE( [device-default-io-ops], - [AC_HELP_STRING([--disable-device-default-io-ops], [Install default IO ops])], + [AS_HELP_STRING([--disable-device-default-io-ops],[install default IO ops])], , [enable_device_default_io_ops="yes"] ) -# Programs # pthread_rwlock_t requires _GNU_SOURCE AC_GNU_SOURCE -AC_PROG_CC -AC_PROG_LIBTOOL + +# Programs +AC_PROG_CC(gcc cc) AC_PROG_LN_S AM_PROG_CC_C_O -# No need to check for ldconfig if --disable-ldconfig was given -if test "$enable_ldconfig" = yes; then - AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) -fi + +ifdef( + [LT_INIT], + [LT_INIT], + [AC_PROG_LIBTOOL] +) + AC_PATH_PROG([MV], [mv]) AC_PATH_PROG([RM], [rm]) AC_PATH_PROG([SED], [sed]) +AC_ARG_VAR([LDCONFIG], [ldconfig utility]) +AC_PATH_PROG([LDCONFIG], [ldconfig], [true], [/sbin /usr/sbin $PATH]) # Environment AC_MSG_CHECKING([Windows OS]) @@ -144,23 +156,31 @@ linux*) AC_ARG_WITH( [fuse], - [AC_HELP_STRING([--with-fuse=<internal|external>], [Select FUSE library: internal or external @<:@default=internal@:>@])], + [AS_HELP_STRING([--with-fuse=<internal|external>],[Select FUSE library: internal or external @<:@default=internal@:>@])], , [with_fuse="internal"] ) ;; -darwin*|netbsd*) +darwin*|netbsd*|solaris*) with_fuse="external" ;; freebsd*) AC_MSG_ERROR([Please see FreeBSD support at http://www.freshports.org/sysutils/fusefs-ntfs]) ;; *) - AC_MSG_ERROR([ntfs-3g can be built only under Linux, FreeBSD, Mac OS X, and NetBSD.]) + AC_MSG_ERROR([ntfs-3g can be built for Linux, FreeBSD, Mac OS X, NetBSD, and Solaris only.]) ;; esac AC_MSG_RESULT([${with_fuse}]) +case "${target_os}" in +solaris*) + if test "x$GCC" != "xyes" ; then + AC_MSG_ERROR([ntfs-3g can be built only with gcc on Solaris. Install it by 'pkg install gcc-dev' and retry.)]) + fi + ;; +esac + if test "${enable_ldscript}" = "yes"; then AC_MSG_CHECKING([Output format]) OUTPUT_FORMAT="$(${CC} ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | ${SED} -n 's/^OUTPUT_FORMAT("\([[^"]]*\)",.*/\1/p')" @@ -180,12 +200,6 @@ [LIBFUSE_LITE_LIBS="${LIBFUSE_LITE_LIBS} -lpthread"], [AC_MSG_ERROR([Cannot find pthread library])] ) - AC_CHECK_LIB( - [rt], - [clock_gettime], - [LIBFUSE_LITE_LIBS="${LIBFUSE_LITE_LIBS} -lrt"], - [AC_MSG_ERROR([Cannot find rt library])] - ) AC_DEFINE( [_REENTRANT], [1], @@ -222,7 +236,7 @@ mntent.h stddef.h stdint.h stdlib.h stdio.h stdarg.h string.h \ strings.h errno.h time.h unistd.h utime.h wchar.h getopt.h features.h \ endian.h byteswap.h sys/byteorder.h sys/endian.h sys/param.h \ - sys/ioctl.h sys/mount.h sys/stat.h sys/types.h sys/vfs.h \ + sys/ioctl.h sys/mkdev.h sys/mount.h sys/stat.h sys/types.h sys/vfs.h \ sys/statvfs.h sys/sysmacros.h linux/major.h linux/fd.h linux/hdreg.h \ machine/endian.h windows.h syslog.h]) @@ -258,14 +272,17 @@ AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF AC_CHECK_FUNCS([ \ - atexit basename dup2 fdatasync getopt_long hasmntopt mbsinit \ - memmove memset realpath regcomp setlocale setxattr strcasecmp strchr \ - strdup strerror strnlen strtol strtoul sysconf utime fork \ + atexit basename daemon dup2 fdatasync ffs getopt_long hasmntopt \ + mbsinit memmove memset realpath regcomp setlocale setxattr \ + strcasecmp strchr strdup strerror strnlen strsep strtol strtoul \ + sysconf utime fork \ ]) AC_SYS_LARGEFILE -# We add -Wall to enable some compiler warnings. -CFLAGS="${CFLAGS} -Wall" +if test "$GCC" = "yes" ; then + # We add -Wall to enable some compiler warnings. + CFLAGS="${CFLAGS} -Wall" +fi if test "${enable_pedantic}" = "yes"; then enable_warnings="yes" @@ -291,8 +308,14 @@ [Don't use default IO ops] ) -if test "${enable_mtab}" = "no"; then - AC_DEFINE([IGNORE_MTAB], [1], [Don't update /etc/mtab]) +test "${enable_mtab}" = "no" && AC_DEFINE([IGNORE_MTAB], [1], [Don't update /etc/mtab]) + +test "${enable_really_static}" = "yes" && enable_library="no" +test "${enable_library}" = "no" && enable_ldconfig="no" + +if test "x${DISTCHECK_HACK}" != "x"; then + enable_mount_helper="no" + enable_ldconfig="no" fi # Settings @@ -323,12 +346,21 @@ AM_CONDITIONAL([GENERATE_LDSCRIPT], [test "${enable_ldscript}" = "yes"]) AM_CONDITIONAL([WINDOWS], [test "${WINDOWS}" = "yes"]) AM_CONDITIONAL([NTFS_DEVICE_DEFAULT_IO_OPS], [test "${enable_device_default_io_ops}" = "yes"]) +AM_CONDITIONAL([RUN_LDCONFIG], [test "${enable_ldconfig}" = "yes"]) +AM_CONDITIONAL([REALLYSTATIC], [test "${enable_really_static}" = "yes"]) +AM_CONDITIONAL([INSTALL_LIBRARY], [test "${enable_library}" = "yes"]) +AM_CONDITIONAL([ENABLE_MOUNT_HELPER], [test "${enable_mount_helper}" = "yes"]) # workaround for <autoconf-2.60 if test -z "${docdir}"; then docdir="\$(datarootdir)/doc/\$(PACKAGE_NAME)" AC_SUBST([docdir]) fi +# workaround for <automake-1.10 +if test -z "${MKDIR_P}"; then + MKDIR_P="\$(mkdir_p)" + AC_SUBST([MKDIR_P]) +fi # generate files AC_CONFIG_FILES([ Index: Makefile.am =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/Makefile.am,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- Makefile.am 19 May 2008 17:40:26 -0000 1.1.1.1.2.2 +++ Makefile.am 6 Sep 2008 14:42:28 -0000 1.1.1.1.2.3 @@ -1,5 +1,6 @@ AUTOMAKE_OPTIONS = gnu +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = AUTHORS CREDITS COPYING NEWS autogen.sh @@ -16,8 +17,16 @@ $(srcdir)/config.sub \ $(srcdir)/config.h.in \ $(srcdir)/config.h.in~ \ - $(srcdir)/INSTALL + $(srcdir)/INSTALL \ + $(srcdir)/m4/ltsugar.m4 \ + $(srcdir)/m4/libtool.m4 \ + $(srcdir)/m4/ltversion.m4 \ + $(srcdir)/m4/lt~obsolete.m4 \ + $(srcdir)/m4/ltoptions.m4 SUBDIRS = include libfuse-lite libntfs-3g src doc_DATA = README + +dist-hook: + $(MKDIR_P) "$(distdir)/m4" Index: autogen.sh =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/autogen.sh,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- autogen.sh 1 Jan 2007 16:55:48 -0000 1.2 +++ autogen.sh 6 Sep 2008 14:42:25 -0000 1.2.2.1 @@ -18,5 +18,5 @@ exit 1 } -echo Running autoreconf --verbose --install -autoreconf --force --verbose --install +echo Running autoreconf --verbose --install --force +autoreconf --verbose --install --force --- NEW FILE: ltmain.sh --- # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, # 2007 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software [...6891 lines suppressed...] # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support # them. This is particularly important on AIX, because we don't # support having both static and shared libraries enabled at the same # time on that platform, so we default to a shared-only configuration. # If a disable-shared tag is given, we'll fallback to a static-only # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared disable_libs=shared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static disable_libs=static # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: |