kopia lustrzana https://gitlab.com/sane-project/backends
Remove unused SANE_LINKER_RPATH macro
rodzic
e4ad1f58f3
commit
f80cf1dbbd
37
acinclude.m4
37
acinclude.m4
|
@ -10,7 +10,6 @@ dnl SANE_CHECK_IEEE1284
|
|||
dnl SANE_CHECK_PTHREAD
|
||||
dnl SANE_CHECK_LOCKING
|
||||
dnl JAPHAR_GREP_AM_CFLAGS(flag, cmd_if_missing, cmd_if_present)
|
||||
dnl SANE_LINKER_RPATH
|
||||
dnl SANE_CHECK_U_TYPES
|
||||
dnl SANE_CHECK_GPHOTO2
|
||||
dnl SANE_CHECK_IPV6
|
||||
|
@ -376,42 +375,6 @@ AC_DEFUN([JAPHAR_GREP_AM_CFLAGS],
|
|||
esac
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl SANE_LINKER_RPATH
|
||||
dnl
|
||||
dnl Detect how to set runtime link path (rpath). Set variable
|
||||
dnl LINKER_RPATH. Typical content will be '-Wl,-rpath,' or '-R '. If
|
||||
dnl set, add '${LINKER_RPATH}${libdir}' to $LDFLAGS
|
||||
dnl
|
||||
|
||||
AC_DEFUN([SANE_LINKER_RPATH],
|
||||
[dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
|
||||
AC_MSG_CHECKING([whether runtime link path should be used])
|
||||
AC_ARG_ENABLE([rpath],
|
||||
[AS_HELP_STRING([--enable-rpath],
|
||||
[use runtime library search path @<:@default=yes@:>@])])
|
||||
|
||||
LINKER_RPATH=
|
||||
AS_IF([test "x$enable_rpath" != xno],
|
||||
AC_MSG_RESULT([yes])
|
||||
[AC_CACHE_CHECK([linker parameter to set runtime link path], my_cv_LINKER_RPATH,
|
||||
[my_cv_LINKER_RPATH=
|
||||
case "$host_os" in
|
||||
linux* | freebsd* | netbsd* | openbsd* | irix*)
|
||||
# I believe this only works with GNU ld [pere 2001-04-16]
|
||||
my_cv_LINKER_RPATH="-Wl,-rpath,"
|
||||
;;
|
||||
solaris*)
|
||||
my_cv_LINKER_RPATH="-R "
|
||||
;;
|
||||
esac
|
||||
])
|
||||
LINKER_RPATH="$my_cv_LINKER_RPATH"],
|
||||
[AC_MSG_RESULT([no])
|
||||
LINKER_RPATH=])
|
||||
AC_SUBST(LINKER_RPATH)dnl
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl SANE_CHECK_U_TYPES
|
||||
dnl
|
||||
|
|
|
@ -72,7 +72,6 @@ dnl set compiler/linker flags
|
|||
dnl ***********************************************************************
|
||||
SANE_SET_AM_CFLAGS([$is_release])
|
||||
SANE_SET_AM_LDFLAGS
|
||||
SANE_LINKER_RPATH
|
||||
|
||||
dnl ***********************************************************************
|
||||
dnl Checks for unix variants
|
||||
|
|
Ładowanie…
Reference in New Issue