aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2008-09-02 23:12:38 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-09-02 23:12:38 -0400
commit55da987650b36a1b910a5968f7d83a190827f8bb (patch)
treeaabd8b8f047a57750c337d656e1a713818026903 /configure
parent3b4a66cfb688af9fa18e6f73ad9349a3d0a972d9 (diff)
downloade2fsprogs-55da987650b36a1b910a5968f7d83a190827f8bb.tar.gz
e2fsprogs-55da987650b36a1b910a5968f7d83a190827f8bb.tar.xz
e2fsprogs-55da987650b36a1b910a5968f7d83a190827f8bb.zip
Improve ELF shared library handling
Pass in -rpath-link option to the linker so that blkid will build correctly on systems that don't have libcom_err.so.2 installed. Fix debugfs to only try to link with -ldl when building without shared libraries; with ELF shared libraries, the library which requires -ldl (libss.so) can required the library dependency itself. Fix how we build tune2fs.static so that we use @LDFLAG_STATIC@, via $(LDFLAGS_STATIC), instead of hard-coding the use of -static. Addresses-Sourceforge-Bug: #2088537 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 13 insertions, 4 deletions
diff --git a/configure b/configure
index 5cf203e6..0e3bdbed 100755
--- a/configure
+++ b/configure
@@ -684,6 +684,8 @@ CHECKER_CMT
LIB_EXT
STATIC_LIB_EXT
PROFILED_LIB_EXT
+LDFLAG_DYNAMIC
+PRIVATE_LIBS_CMT
TEST_IO_CMT
DEBUGFS_CMT
IMAGER_CMT
@@ -3842,6 +3844,8 @@ fi
E2_PKG_CONFIG_STATIC=--static
+LDFLAG_DYNAMIC=
+PRIVATE_LIBS_CMT=
# Check whether --enable-elf-shlibs was given.
if test "${enable_elf_shlibs+set}" = set; then
enableval=$enable_elf_shlibs; if test "$enableval" = "no"
@@ -3861,6 +3865,8 @@ else
esac
BINARY_TYPE=elfbin
LIB_EXT=.so
+ PRIVATE_LIBS_CMT=#
+ LDFLAG_DYNAMIC='-Wl,-rpath-link,$(top_builddir)/lib'
{ echo "$as_me:$LINENO: result: Enabling ELF shared libraries" >&5
echo "${ECHO_T}Enabling ELF shared libraries" >&6; }
fi
@@ -3962,6 +3968,8 @@ fi
+
+
# Check whether --enable-jbd-debug was given.
if test "${enable_jbd_debug+set}" = set; then
enableval=$enable_jbd_debug; if test "$enableval" = "no"
@@ -15902,8 +15910,8 @@ CHECKER_CMT!$CHECKER_CMT$ac_delim
LIB_EXT!$LIB_EXT$ac_delim
STATIC_LIB_EXT!$STATIC_LIB_EXT$ac_delim
PROFILED_LIB_EXT!$PROFILED_LIB_EXT$ac_delim
-TEST_IO_CMT!$TEST_IO_CMT$ac_delim
-DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
+LDFLAG_DYNAMIC!$LDFLAG_DYNAMIC$ac_delim
+PRIVATE_LIBS_CMT!$PRIVATE_LIBS_CMT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
@@ -15977,6 +15985,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+TEST_IO_CMT!$TEST_IO_CMT$ac_delim
+DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
IMAGER_CMT!$IMAGER_CMT$ac_delim
RESIZER_CMT!$RESIZER_CMT$ac_delim
FSCK_PROG!$FSCK_PROG$ac_delim
@@ -16060,7 +16070,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -16508,4 +16518,3 @@ if test "$no_create" != yes; then
fi
if test -f util/gen-tarball; then chmod +x util/gen-tarball; fi
-