Add support for -rpath.

This commit is contained in:
Jonathan Schleifer 2009-06-03 21:32:40 +02:00
parent a65decbcb3
commit 581a447e83
2 changed files with 9 additions and 1 deletions

View file

@ -38,8 +38,8 @@ DFLAGS = @DFLAGS@
ERLCFLAGS = @ERLCFLAGS@ ERLCFLAGS = @ERLCFLAGS@
OBJCFLAGS = @OBJCFLAGS@ OBJCFLAGS = @OBJCFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
PYTHON_FLAGS = @PYTHON_FLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
PYTHON_FLAGS = @PYTHON_FLAGS@
PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@ PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@ PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@
PROG_SUFFIX = @EXEEXT@ PROG_SUFFIX = @EXEEXT@
@ -52,6 +52,7 @@ PLUGIN_CPPFLAGS = @PLUGIN_CPPFLAGS@
PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
RPATH_LDFLAGS = @RPATH_LDFLAGS@
INSTALL_LIB = @INSTALL_LIB@ INSTALL_LIB = @INSTALL_LIB@
UNINSTALL_LIB = @UNINSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@
CLEAN_LIB = @CLEAN_LIB@ CLEAN_LIB = @CLEAN_LIB@

View file

@ -79,6 +79,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
PLUGIN_CFLAGS='-fPIC' PLUGIN_CFLAGS='-fPIC'
PLUGIN_LDFLAGS='-shared -fPIC' PLUGIN_LDFLAGS='-shared -fPIC'
PLUGIN_SUFFIX='.so' PLUGIN_SUFFIX='.so'
RPATH_LDFLAGS='-Wl,-rpath,${libdir}'
INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
CLEAN_LIB='' CLEAN_LIB=''
@ -94,6 +95,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
PLUGIN_CFLAGS='-fPIC' PLUGIN_CFLAGS='-fPIC'
PLUGIN_LDFLAGS='-shared -fPIC' PLUGIN_LDFLAGS='-shared -fPIC'
PLUGIN_SUFFIX='.so' PLUGIN_SUFFIX='.so'
RPATH_LDFLAGS='-Wl,-rpath,${libdir}'
INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i'
CLEAN_LIB='' CLEAN_LIB=''
@ -109,6 +111,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
PLUGIN_CFLAGS='' PLUGIN_CFLAGS=''
PLUGIN_LDFLAGS='-shared' PLUGIN_LDFLAGS='-shared'
PLUGIN_SUFFIX='.dll' PLUGIN_SUFFIX='.dll'
RPATH_LDFLAGS='-Wl,-rpath,${libdir}'
INSTALL_LIB='${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' INSTALL_LIB='${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
CLEAN_LIB='${LIB}.a' CLEAN_LIB='${LIB}.a'
@ -124,6 +127,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
PLUGIN_CFLAGS='-fPIC' PLUGIN_CFLAGS='-fPIC'
PLUGIN_LDFLAGS='-shared -fPIC' PLUGIN_LDFLAGS='-shared -fPIC'
PLUGIN_SUFFIX='.so' PLUGIN_SUFFIX='.so'
RPATH_LDFLAGS='-Wl,-rpath,${libdir}'
INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
CLEAN_LIB='' CLEAN_LIB=''
@ -139,6 +143,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
AC_SUBST(PLUGIN_CFLAGS) AC_SUBST(PLUGIN_CFLAGS)
AC_SUBST(PLUGIN_LDFLAGS) AC_SUBST(PLUGIN_LDFLAGS)
AC_SUBST(PLUGIN_SUFFIX) AC_SUBST(PLUGIN_SUFFIX)
AC_SUBST(RPATH_LDFLAGS)
AC_SUBST(INSTALL_LIB) AC_SUBST(INSTALL_LIB)
AC_SUBST(UNINSTALL_LIB) AC_SUBST(UNINSTALL_LIB)
AC_SUBST(CLEAN_LIB) AC_SUBST(CLEAN_LIB)
@ -153,6 +158,7 @@ AC_DEFUN([BUILDSYS_STATIC_LIB_ONLY], [
LIB_LDFLAGS='' LIB_LDFLAGS=''
LIB_PREFIX='lib' LIB_PREFIX='lib'
LIB_SUFFIX='.a' LIB_SUFFIX='.a'
RPATH_LDFLAGS=''
INSTALL_LIB='${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i' INSTALL_LIB='${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i'
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i'
CLEAN_LIB='' CLEAN_LIB=''
@ -162,6 +168,7 @@ AC_DEFUN([BUILDSYS_STATIC_LIB_ONLY], [
AC_SUBST(LIB_LDFLAGS) AC_SUBST(LIB_LDFLAGS)
AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX) AC_SUBST(LIB_SUFFIX)
AC_SUBST(RPATH_LDFLAGS)
AC_SUBST(INSTALL_LIB) AC_SUBST(INSTALL_LIB)
AC_SUBST(UNINSTALL_LIB) AC_SUBST(UNINSTALL_LIB)
AC_SUBST(CLEAN_LIB) AC_SUBST(CLEAN_LIB)