Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 283596 | Differences between
and this patch

Collapse All | Expand All

(-)cmulocal/cyrus.m4.old (-25 / +2 lines)
Lines 11-45 Link Here
11
dnl (so the runpath for shared libraries is set).
11
dnl (so the runpath for shared libraries is set).
12
AC_DEFUN([CMU_ADD_LIBPATH], [
12
AC_DEFUN([CMU_ADD_LIBPATH], [
13
  # this is CMU ADD LIBPATH
13
  # this is CMU ADD LIBPATH
14
  if test "$andrew_runpath_switch" = "none" ; then
14
LDFLAGS="-L$1 ${LDFLAGS}"
15
	LDFLAGS="-L$1 ${LDFLAGS}"
16
  else
17
	LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}"
18
  fi
19
])
15
])
20
16
21
dnl add -L(1st arg), and possibly (runpath switch)(1st arg), to (2nd arg)
17
dnl add -L(1st arg), and possibly (runpath switch)(1st arg), to (2nd arg)
22
dnl (so the runpath for shared libraries is set).
18
dnl (so the runpath for shared libraries is set).
23
AC_DEFUN([CMU_ADD_LIBPATH_TO], [
19
AC_DEFUN([CMU_ADD_LIBPATH_TO], [
24
  # this is CMU ADD LIBPATH TO
20
  # this is CMU ADD LIBPATH TO
25
  if test "$andrew_runpath_switch" = "none" ; then
21
$2="-L$1 ${$2}"
26
	$2="-L$1 ${$2}"
27
  else
28
	$2="-L$1 ${$2} $andrew_runpath_switch$1"
29
  fi
30
])
22
])
31
32
dnl runpath initialization
33
AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
34
   # CMU GUESS RUNPATH SWITCH
35
  AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [
36
    # first, try -R
37
    SAVE_LDFLAGS="${LDFLAGS}"
38
    LDFLAGS="-R /usr/lib"
39
    AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
40
  	LDFLAGS="-Wl,-rpath,/usr/lib"
41
    AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
42
    [andrew_runpath_switch="none"])
43
    ])
44
  LDFLAGS="${SAVE_LDFLAGS}"
45
  ])])

Return to bug 283596