aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
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.in
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.in')
-rw-r--r--configure.in19
1 files changed, 17 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index e521ddc5..0b96b8d2 100644
--- a/configure.in
+++ b/configure.in
@@ -170,19 +170,34 @@ AC_SUBST(LINK_INSTALL_FLAGS)
dnl
dnl handle --enable-relative-symlinks
dnl
-AC_ARG_ENABLE([symlink-relative-symlinks],
+relative_symlink_defined=
+AC_ARG_ENABLE([relative-symlinks],
[ --enable-relative-symlinks use relative symlinks when installing],
if test "$enableval" = "no"
then
SYMLINK_RELATIVE=
+ relative_symlink_defined=yes
AC_MSG_RESULT([Disabling relative symlinks for install])
else
SYMLINK_RELATIVE=--relative
- AC_MSG_RESULT([Enabling symlinks for install])
+ relative_symlink_defined=yes
+ AC_MSG_RESULT([Enabling relative symlinks for install])
+fi)
+AC_ARG_ENABLE([symlink-relative-symlinks],,
+if test "$enableval" = "no"
+then
+ SYMLINK_RELATIVE=yes
+ AC_MSG_RESULT([Disabling relative symlinks for install])
+else
+ SYMLINK_RELATIVE=--relative
+ AC_MSG_RESULT([Enabling relative symlinks for install])
fi
,
+if test -z "$relative_symlink_defined"
+then
SYMLINK_RELATIVE=
AC_MSG_RESULT([Disabling relative symlinks for install by default])
+fi
)
AC_SUBST(SYMLINK_RELATIVE)
dnl