diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-09-02 23:12:38 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-09-02 23:12:38 -0400 |
| commit | 55da987650b36a1b910a5968f7d83a190827f8bb (patch) | |
| tree | aabd8b8f047a57750c337d656e1a713818026903 /MCONFIG.in | |
| parent | 3b4a66cfb688af9fa18e6f73ad9349a3d0a972d9 (diff) | |
| download | e2fsprogs-55da987650b36a1b910a5968f7d83a190827f8bb.tar.gz | |
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 'MCONFIG.in')
| -rw-r--r-- | MCONFIG.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MCONFIG.in b/MCONFIG.in index 554b5b520..2f32b9237 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -41,7 +41,8 @@ INTL_FLAGS = @INTL_FLAGS@ ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \ $(INTL_FLAGS) $(LINUX_INCLUDE) LDFLAGS = @LDFLAGS@ -ALL_LDFLAGS = $(LDFLAGS) +ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@ +LDFLAGS_STATIC = $(LDFLAGS) @LDFLAG_STATIC@ BUILD_CFLAGS = @BUILD_CFLAGS@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ RM = @RM@ @@ -69,7 +70,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ # Library definitions # LIB = $(top_builddir)/lib -LIBSS = $(LIB)/libss@LIB_EXT@ @DLOPEN_LIB@ +LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@ LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ LIBE2P = $(LIB)/libe2p@LIB_EXT@ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ |