From f0ad8c7ed0c026c4b6116770ea1b2d6c941bbe2c Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Thu, 26 Feb 2004 11:41:48 +0000 Subject: [PATCH] Update (Logical change 1.283) --- config.h.in | 5 ++ configure | 107 +++++++++++++++++++++++++----------------- ntfsprogs/Makefile.in | 4 +- 3 files changed, 70 insertions(+), 46 deletions(-) diff --git a/config.h.in b/config.h.in index 637a2f6f..00c24ccc 100644 --- a/config.h.in +++ b/config.h.in @@ -201,6 +201,11 @@ slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK +/* Define this if you do not want the NTFS library to provide default device + io operations. This means that you cannot use ntfs_mount() but have to use + ntfs_device_mount() and provide your own device operations. */ +#undef NO_NTFS_DEVICE_DEFAULT_IO_OPS + /* Name of package */ #undef PACKAGE diff --git a/configure b/configure index 96ccc398..4d1f4401 100755 --- a/configure +++ b/configure @@ -1034,15 +1034,18 @@ Optional Features: build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] - --enable-debug enable debugging - --enable-really-static completely static binaries + --enable-debug enable additional debugging code and output + --disable-default-device-io-ops + do not provide default device io operations + --disable-gnome-vfs omit Gnome-VFS-2.0 'libntfs' interface + (default=detect) + --enable-really-static create completely static binaries for the utilities --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --disable-gnome-vfs Omit Gnome-VFS-2.0 'libntfs' interface (default=detect) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2067,6 +2070,30 @@ else fi; +# AH_TEMPLATE is needed here because we want to have a template in config.h +# regardless of whether the option is given or not. + + +# Check whether --enable-default-device-io-ops or --disable-default-device-io-ops was given. +if test "${enable_default_device_io_ops+set}" = set; then + enableval="$enable_default_device_io_ops" + if test "$enable_default_device_io_ops" == "no"; then + cat >>confdefs.h <<\_ACEOF +#define NO_NTFS_DEVICE_DEFAULT_IO_OPS 1 +_ACEOF + + fi +fi; + +# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given. +if test "${enable_gnome_vfs+set}" = set; then + enableval="$enable_gnome_vfs" + +else + enable_gnome_vfs=auto + +fi; + # Check whether --enable-really-static or --disable-really-static was given. if test "${enable_really_static+set}" = set; then enableval="$enable_really_static" @@ -2077,7 +2104,6 @@ else fi; - if test "$enable_really_static" = yes; then REALLYSTATIC_TRUE= REALLYSTATIC_FALSE='#' @@ -3760,7 +3786,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3763 "configure"' > conftest.$ac_ext + echo '#line 3789 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5257,7 +5283,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5260:" \ +echo "$as_me:5286:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6262,11 +6288,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6265: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6291: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6269: \$? = $ac_status" >&5 + echo "$as_me:6295: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6494,11 +6520,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6523: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6501: \$? = $ac_status" >&5 + echo "$as_me:6527: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6561,11 +6587,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6564: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6590: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6568: \$? = $ac_status" >&5 + echo "$as_me:6594: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8580,7 +8606,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10839: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10817: \$? = $ac_status" >&5 + echo "$as_me:10843: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10877,11 +10903,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10880: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10906: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10884: \$? = $ac_status" >&5 + echo "$as_me:10910: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12127,7 +12153,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13076: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13054: \$? = $ac_status" >&5 + echo "$as_me:13080: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13114,11 +13140,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13117: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13143: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13121: \$? = $ac_status" >&5 + echo "$as_me:13147: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15061,11 +15087,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15064: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15090: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15068: \$? = $ac_status" >&5 + echo "$as_me:15094: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15293,11 +15319,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15296: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15322: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15300: \$? = $ac_status" >&5 + echo "$as_me:15326: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15360,11 +15386,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15363: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15389: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15367: \$? = $ac_status" >&5 + echo "$as_me:15393: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17379,7 +17405,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 else if test "$enable_gnome_vfs" = "yes"; then - { { echo "$as_me:$LINENO: error: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares." >&5 -echo "$as_me: error: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares." >&2;} + { { echo "$as_me:$LINENO: error: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 libraries." >&5 +echo "$as_me: error: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 libraries." >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: WARNING: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares." >&5 -echo "$as_me: WARNING: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares." >&2;} + { echo "$as_me:$LINENO: WARNING: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 libraries." >&5 +echo "$as_me: WARNING: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 libraries." >&2;} fi fi diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index a0f7e0d5..3e283e46 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -146,10 +146,10 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -@REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a -@REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries) +@REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@AM_LFLAGS = -static +@REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries) @REALLYSTATIC_TRUE@STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ @REALLYSTATIC_FALSE@LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@