aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
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.in
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.in')
-rw-r--r--configure.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index fcca2acf..7ec69458 100644
--- a/configure.in
+++ b/configure.in
@@ -211,6 +211,8 @@ dnl
dnl This needs to be before all of the --enable-*-shlibs options
dnl
E2_PKG_CONFIG_STATIC=--static
+LDFLAG_DYNAMIC=
+PRIVATE_LIBS_CMT=
dnl
dnl handle --enable-elf-shlibs
dnl
@@ -232,6 +234,8 @@ else
esac]
BINARY_TYPE=elfbin
LIB_EXT=.so
+ PRIVATE_LIBS_CMT=#
+ LDFLAG_DYNAMIC=['-Wl,-rpath-link,$(top_builddir)/lib']
AC_MSG_RESULT([Enabling ELF shared libraries])
fi
,
@@ -322,6 +326,8 @@ dnl
AC_SUBST(LIB_EXT)
AC_SUBST(STATIC_LIB_EXT)
AC_SUBST(PROFILED_LIB_EXT)
+AC_SUBST(LDFLAG_DYNAMIC)
+AC_SUBST(PRIVATE_LIBS_CMT)
dnl
dnl handle --enable-jbd-debug
dnl
@@ -921,4 +927,3 @@ for i in MCONFIG Makefile e2fsprogs.spec \
done
AC_OUTPUT($outlist)
if test -f util/gen-tarball; then chmod +x util/gen-tarball; fi
-