Hi Alon,
On Wed, 11 Jun 2008, Alon Bar-Lev wrote:
> This patch will work with libtool-1 and libtool-2, it detects the correct
> version at runtime.
Thank you and sorry for the slow reply.
Does the current build work with libtool-2 without the libtool-2 specific
parts in the the patch (LT_INIT, m4)?
> You need to have m4 directory in source tree, maybe commit m4/.keep as I
> believe CVS ignores empty directories.
Yes, it may ignore if it's empty. Is the m4 directory really needed?
> Some modifications made by autoupdate:
> - space removed.
> - AM_CONFIG_HEADER->AC_CONFIG_HEADERS
Ok.
Thanks,
Szaka
> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/ntfs-3g/ntfs-3g/Makefile.am,v
> retrieving revision 1.3
> diff -u -B -r1.3 Makefile.am
> --- Makefile.am 19 May 2008 17:34:34 -0000 1.3
> +++ Makefile.am 11 Jun 2008 10:57:09 -0000
> @@ -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: configure.ac
> ===================================================================
> RCS file: /cvsroot/ntfs-3g/ntfs-3g/configure.ac,v
> retrieving revision 1.70
> diff -u -B -r1.70 configure.ac
> --- configure.ac 28 May 2008 19:04:59 -0000 1.70
> +++ configure.ac 11 Jun 2008 10:57:14 -0000
> @@ -22,7 +22,7 @@
> # Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>
> # Autoconf
> -AC_PREREQ([2.59])
> +AC_PREREQ(2.59)
> AC_INIT([ntfs-3g],[1.2531],[EMAIL PROTECTED])
> LIBNTFS_3G_VERSION="31"
> AC_CONFIG_SRCDIR([src/ntfs-3g.c])
> @@ -33,48 +33,49 @@
>
> # 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"]
> )
>
> AC_ARG_ENABLE(
> [library],
> - [AC_HELP_STRING([--disable-library], [do not install libntfs-3g but
> link it into ntfs-3g])],
> + [AS_HELP_STRING([--disable-library],[do not install libntfs-3g but link
> it into ntfs-3g])],
> ,
> [enable_library="yes"]
> )
>
> AC_ARG_ENABLE(
> [mount-helper],
> - [AC_HELP_STRING([--enable-mount-helper], [install mount helper
> @<:@default=enabled for linux@:>@])],
> + [AS_HELP_STRING([--enable-mount-helper],[install mount helper
> @<:@default=enabled for linux@:>@])],
> ,
> [
> case "${target_os}" in
> @@ -86,28 +87,28 @@
>
> 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"]
> )
>
> AC_ARG_ENABLE(
> [ldscript],
> - [AC_HELP_STRING([--enable-ldscript], [use ldscript instead of .so
> symlink])],
> + [AS_HELP_STRING([--enable-ldscript],[use ldscript instead of .so
> symlink])],
> ,
> [enable_ldscript="no"]
> )
>
> 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"]
> )
> @@ -117,9 +118,15 @@
>
> # Programs
> AC_PROG_CC
> -AC_PROG_LIBTOOL
> AC_PROG_LN_S
> AM_PROG_CC_C_O
> +
> +ifdef(
> + [LT_INIT],
> + [LT_INIT],
> + [AC_PROG_LIBTOOL]
> +)
> +
> AC_PATH_PROG([MV], [mv])
> AC_PATH_PROG([RM], [rm])
> AC_PATH_PROG([SED], [sed])
> @@ -149,7 +156,7 @@
> 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"]
> )
>
--
NTFS-3G: http://ntfs-3g.org
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
ntfs-3g-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ntfs-3g-devel
