aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-09-09 22:52:26 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-09-09 22:52:26 -0400
commit0e7e7c8ef89cf32fdb1210bfde1feb90880c327b (patch)
tree50d2ccb9353696ae1153e6fe324a874e5d5757d8 /configure
parentdaf57eaaae5eeef849d5dae4bbf3bf8687ca2c08 (diff)
parentab3f5c5aad6310be1d1891c05f1bc8cf7ccf0cef (diff)
downloade2fsprogs-0e7e7c8ef89cf32fdb1210bfde1feb90880c327b.tar.gz
e2fsprogs-0e7e7c8ef89cf32fdb1210bfde1feb90880c327b.tar.xz
e2fsprogs-0e7e7c8ef89cf32fdb1210bfde1feb90880c327b.zip
Merge branch 'maint' into next
Conflicts: lib/ext2fs/ext2fs.h
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure30
1 files changed, 26 insertions, 4 deletions
diff --git a/configure b/configure
index 17f8023c..d47cef72 100755
--- a/configure
+++ b/configure
@@ -825,6 +825,7 @@ with_ldopts
with_root_prefix
enable_maintainer_mode
enable_symlink_install
+enable_relative_symlinks
enable_symlink_relative_symlinks
enable_symlink_build
enable_verbose_makecmds
@@ -1483,6 +1484,7 @@ Optional Features:
--enable-maintainer-mode enable makefile rules useful for maintainers
--enable-symlink-install use symlinks when installing instead of hard links
--enable-relative-symlinks use relative symlinks when installing
+
--enable-symlink-build use symlinks while building instead of hard links
--enable-verbose-makecmds enable verbose make command output
--enable-compression enable EXPERIMENTAL compression support
@@ -4435,23 +4437,43 @@ $as_echo "Disabling symlinks for install by default" >&6; }
fi
+relative_symlink_defined=
+# Check whether --enable-relative-symlinks was given.
+if test "${enable_relative_symlinks+set}" = set; then :
+ enableval=$enable_relative_symlinks; if test "$enableval" = "no"
+then
+ SYMLINK_RELATIVE=
+ relative_symlink_defined=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling relative symlinks for install" >&5
+$as_echo "Disabling relative symlinks for install" >&6; }
+else
+ SYMLINK_RELATIVE=--relative
+ relative_symlink_defined=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling relative symlinks for install" >&5
+$as_echo "Enabling relative symlinks for install" >&6; }
+fi
+fi
+
# Check whether --enable-symlink-relative-symlinks was given.
if test "${enable_symlink_relative_symlinks+set}" = set; then :
enableval=$enable_symlink_relative_symlinks; if test "$enableval" = "no"
then
- SYMLINK_RELATIVE=
+ SYMLINK_RELATIVE=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling relative symlinks for install" >&5
$as_echo "Disabling relative symlinks for install" >&6; }
else
SYMLINK_RELATIVE=--relative
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling symlinks for install" >&5
-$as_echo "Enabling symlinks for install" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling relative symlinks for install" >&5
+$as_echo "Enabling relative symlinks for install" >&6; }
fi
else
- SYMLINK_RELATIVE=
+ if test -z "$relative_symlink_defined"
+then
+ SYMLINK_RELATIVE=
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling relative symlinks for install by default" >&5
$as_echo "Disabling relative symlinks for install by default" >&6; }
+fi
fi