diff options
| author | Michael Adam <obnox@samba.org> | 2011-11-25 16:36:40 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-11-26 00:34:54 +0100 |
| commit | 2c0abf2dcf040e6e32612e65f04ff488745612ae (patch) | |
| tree | d2c86b044dd2727e469f65e66bca49fe958d6b66 /ctdb/lib/replace/libreplace_ld.m4 | |
| parent | 5d94dff27e96e09e1f81d4811ce1e2492edff13f (diff) | |
update lib/replace to current upstream version (samba master)
(This used to be ctdb commit 17bcffab19fdbb435b4745ff90c327342bbbf0f8)
Diffstat (limited to 'ctdb/lib/replace/libreplace_ld.m4')
| -rw-r--r-- | ctdb/lib/replace/libreplace_ld.m4 | 50 |
1 files changed, 37 insertions, 13 deletions
diff --git a/ctdb/lib/replace/libreplace_ld.m4 b/ctdb/lib/replace/libreplace_ld.m4 index cb8e21434e..bf0df6186d 100644 --- a/ctdb/lib/replace/libreplace_ld.m4 +++ b/ctdb/lib/replace/libreplace_ld.m4 @@ -40,7 +40,7 @@ LDFLAGS="$saved_LDFLAGS" AC_DEFUN([AC_LD_PICFLAG], [ case "$host_os" in - *linux*) + *linux*|*gnu*) PICFLAG="-fPIC" ;; *solaris*) @@ -71,13 +71,12 @@ case "$host_os" in PICFLAG="-O2" ;; *hpux*) - if test $ac_cv_prog_cc_Ae = yes; then - PICFLAG="+z +ESnolit" - elif test "${GCC}" = "yes"; then + if test "${GCC}" = "yes"; then PICFLAG="-fPIC" - fi - if test "$host_cpu" = "ia64"; then - PICFLAG="+z" + elif test "$host_cpu" = "ia64"; then + PICFLAG="+z" + elif test $ac_cv_prog_cc_Ae = yes; then + PICFLAG="+z +ESnolit" fi ;; *osf*) @@ -111,7 +110,7 @@ AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_FLAGS], LD_SHLIB_FLAGS="-shared" case "$host_os" in - *linux*) + *linux*|*gnu*) LD_SHLIB_FLAGS="-shared -Wl,-Bsymbolic" ;; *solaris*) @@ -209,7 +208,7 @@ AC_DEFUN([AC_LD_SONAMEFLAG], AC_SUBST(SONAMEFLAG) SONAMEFLAG="" case "$host_os" in - *linux*) + *linux*|*gnu*|*qnx*) SONAMEFLAG="-Wl,-soname=" ;; *solaris*) @@ -249,6 +248,22 @@ AC_DEFUN([AC_LD_SONAMEFLAG], esac ]) +AC_DEFUN([AC_LD_VERSIONSCRIPT], +[ + AC_SUBST(VERSIONSCRIPT) + VERSIONSCRIPT="" + case "$host_os" in + *linux*|*gnu*) + VERSIONSCRIPT="-Wl,--version-script" + ;; + *solaris*) + if test "${GCC}" = "yes"; then + VERSIONSCRIPT="-Wl,--version-script" + fi + ;; + esac +]) + AC_DEFUN([AC_LIBREPLACE_MDLD], [ AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_LINKER]) @@ -261,15 +276,18 @@ AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_ALLOW_UNDEF_FLAG], LD_ALLOW_SHLIB_UNDEF_FLAG="" case "$host_os" in - *linux*) + *linux*|*gnu*) LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,--allow-shlib-undefined" ;; *osf*) - LD_SHLIB_ALLOW_UNDEF_FLAG="-expect_unresolved '*'" + LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,-expect_unresolved,\"*\"" ;; *darwin*) LD_SHLIB_ALLOW_UNDEF_FLAG="-undefined dynamic_lookup" ;; + *aix*) + LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,-bnoentry" + ;; esac AC_SUBST(LD_SHLIB_ALLOW_UNDEF_FLAG) @@ -286,7 +304,10 @@ AC_DEFUN([AC_LIBREPLACE_MDLD_FLAGS], AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], [ case "$host_os" in - *linux*) + *linux*|*gnu*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *bsd*) LIB_PATH_VAR=LD_LIBRARY_PATH ;; *solaris*) @@ -299,7 +320,7 @@ AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], LIB_PATH_VAR=LD_LIBRARY_PATH ;; *aix*) - LIB_PATH_VAR=LIB_PATH + LIB_PATH_VAR=LIBPATH ;; *irix*) LIB_PATH_VAR=LD_LIBRARY_PATH @@ -307,6 +328,9 @@ AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], *darwin*) LIB_PATH_VAR=DYLD_LIBRARY_PATH ;; + *) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; esac AC_SUBST(LIB_PATH_VAR) |