|
| 1 | +diff --git a/autoconf.mk.in b/autoconf.mk.in |
| 2 | +index 2836b4f1..cbf57efc 100644 |
| 3 | +--- a/autoconf.mk.in |
| 4 | ++++ b/autoconf.mk.in |
| 5 | +@@ -23,7 +23,6 @@ LIBS=@LIBS@ |
| 6 | + CPPFLAGS=@CPPFLAGS@ |
| 7 | + CXX=@CXX@ |
| 8 | + CXXFLAGS=@CXXFLAGS@ $(CXXWFLAGS) $(WFLAGS) |
| 9 | +-RPATH=@RPATH@ |
| 10 | + AR=@AR@ |
| 11 | + RANLIB=@RANLIB@ |
| 12 | + DLLTOOL=@DLLTOOL@ |
| 13 | +diff --git a/autofiles.sums b/autofiles.sums |
| 14 | +index 956715ab..e155a8a2 100644 |
| 15 | +--- a/autofiles.sums |
| 16 | ++++ b/autofiles.sums |
| 17 | +@@ -1,4 +1,4 @@ |
| 18 | +-285564a8480dcb79d7b42bf92c1919289b12238865a9d73aa3355277b1f46dc8 configure.ac |
| 19 | ++428dcebb36fbe0a150f99f7ee72c82b705a69f47c05565a7d1ed30aa88b81167 configure.ac |
| 20 | + d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4 |
| 21 | + c12d837479fa9a3fa4c278b6dc7d6b449503d663e0f0d294305595a51ff43f70 libqpdf/qpdf/qpdf-config.h.in |
| 22 | + 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4 |
| 23 | +diff --git a/configure b/configure |
| 24 | +index 3118deed..7e715abf 100755 |
| 25 | +--- a/configure |
| 26 | ++++ b/configure |
| 27 | +@@ -670,7 +670,6 @@ PKG_CONFIG |
| 28 | + WINDOWS_WORDSIZE |
| 29 | + IS_32BIT |
| 30 | + RANDOM_DEVICE |
| 31 | +-RPATH |
| 32 | + LT_SONAME |
| 33 | + LT_AGE |
| 34 | + LT_REVISION |
| 35 | +@@ -16353,10 +16352,17 @@ fi |
| 36 | + if test "$qpdf_USE_RPATH" = "1"; then |
| 37 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| 38 | + $as_echo "yes" >&6; } |
| 39 | +- RPATH='-rpath $(libdir)' |
| 40 | + else |
| 41 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 42 | + $as_echo "no" >&6; } |
| 43 | ++ if test "${hardcode_libdir_flag_spec/rpath/}" != "$hardcode_libdir_flag_spec"; then |
| 44 | ++ hardcode_libdir_flag_spec= |
| 45 | ++ fi |
| 46 | ++ runpath_var= |
| 47 | ++ if test "${hardcode_libdir_flag_spec_CXX/rpath/}" != "$hardcode_libdir_flag_spec_CXX"; then |
| 48 | ++ hardcode_libdir_flag_spec_CXX= |
| 49 | ++ fi |
| 50 | ++ runpath_var_CXX= |
| 51 | + fi |
| 52 | + |
| 53 | + |
| 54 | +diff --git a/configure.ac b/configure.ac |
| 55 | +index 612a049b..ace0543f 100644 |
| 56 | +--- a/configure.ac |
| 57 | ++++ b/configure.ac |
| 58 | +@@ -72,11 +72,17 @@ AC_ARG_ENABLE(rpath, |
| 59 | + fi], [qpdf_USE_RPATH=1]) |
| 60 | + if test "$qpdf_USE_RPATH" = "1"; then |
| 61 | + AC_MSG_RESULT(yes) |
| 62 | +- RPATH='-rpath $(libdir)' |
| 63 | + else |
| 64 | + AC_MSG_RESULT(no) |
| 65 | ++ if test "${hardcode_libdir_flag_spec/rpath/}" != "$hardcode_libdir_flag_spec"; then |
| 66 | ++ hardcode_libdir_flag_spec= |
| 67 | ++ fi |
| 68 | ++ runpath_var= |
| 69 | ++ if test "${hardcode_libdir_flag_spec_CXX/rpath/}" != "$hardcode_libdir_flag_spec_CXX"; then |
| 70 | ++ hardcode_libdir_flag_spec_CXX= |
| 71 | ++ fi |
| 72 | ++ runpath_var_CXX= |
| 73 | + fi |
| 74 | +-AC_SUBST(RPATH) |
| 75 | + |
| 76 | + AC_MSG_CHECKING(for -fvisibility=hidden) |
| 77 | + try_flags=-fvisibility=hidden |
| 78 | +diff --git a/make/libtool.mk b/make/libtool.mk |
| 79 | +index 2ff96f86..c9ed6b3b 100644 |
| 80 | +--- a/make/libtool.mk |
| 81 | ++++ b/make/libtool.mk |
| 82 | +@@ -95,7 +95,7 @@ define makelib |
| 83 | + $(LIBTOOL) --mode=link --tag=CXX \ |
| 84 | + $(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \ |
| 85 | + -o $(2) $(1) $(3) $(4) \ |
| 86 | +- $(RPATH) -version-info $(5):$(6):$(7) -no-undefined |
| 87 | ++ -rpath $(libdir) -version-info $(5):$(6):$(7) -no-undefined |
| 88 | + endef |
| 89 | + |
| 90 | + # 1 2 3 4 5 |
0 commit comments