diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad use of DESTDIR (Keri Harris)

Browse Source
This commit is contained in:
Vitor Santos Costa
2010-09-21 22:19:44 +01:00
parent 9d0f414d30
commit 425412b8ca
2 changed files with 2622 additions and 12244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14822
configure vendored
View File

File diff suppressed because it is too large Load Diff

44
configure.in
View File

@@ -889,17 +889,17 @@ case "$target_os" in
SHLIB_CFLAGS="-shared -fPIC $CFLAGS" SHLIB_CFLAGS="-shared -fPIC $CFLAGS"
SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS"
INSTALL_DLLS="" INSTALL_DLLS=""
fi fi
fi fi
if test "$have_nsl" = yes if test "$have_nsl" = yes
then then
LIBS="$LIBS -lnsl" LIBS="$LIBS -lnsl"
fi fi
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
DYNYAPLIB=libYap."$SO" DYNYAPLIB=libYap."$SO"
if test "$dynamic_loading" = "yes" if test "$dynamic_loading" = "yes"
then then
YAPLIB_LD="\$(CC) -shared" YAPLIB_LD="\$(CC) -shared"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
@@ -913,9 +913,9 @@ case "$target_os" in
*sunos4*) *sunos4*)
M4="/usr/5bin/m4" M4="/usr/5bin/m4"
LDFLAGS="$LDFLAGS -N" LDFLAGS="$LDFLAGS -N"
if test "$have_nsl" = yes if test "$have_nsl" = yes
then then
LIBS="$LIBS -lnsl" LIBS="$LIBS -lnsl"
fi fi
SO="o" SO="o"
INSTALL_DLLS="" INSTALL_DLLS=""
@@ -952,9 +952,9 @@ case "$target_os" in
else else
INSTALL_DLLS="#" INSTALL_DLLS="#"
fi fi
fi fi
#do not use realloc() from HP-UX 10.20 together with MPI #do not use realloc() from HP-UX 10.20 together with MPI
if test ${target_os} = hpux10.20 if test ${target_os} = hpux10.20
then then
AC_DEFINE(MPI_AVOID_REALLOC,1) AC_DEFINE(MPI_AVOID_REALLOC,1)
fi fi
@@ -965,9 +965,9 @@ case "$target_os" in
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
;; ;;
*aix*) *aix*)
# To actually use dlls in AIX I'd need to build YAP as a DLL first. # To actually use dlls in AIX I'd need to build YAP as a DLL first.
# I won't bother for now. # I won't bother for now.
# #
# SO="a" # SO="a"
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry" #SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
#INSTALL_DLLS="" #INSTALL_DLLS=""
@@ -983,9 +983,9 @@ dnl Linux has both elf and a.out, in this case we found elf
AC_CHECK_LIB(dl,dlopen, AC_CHECK_LIB(dl,dlopen,
dnl Linux has both elf and a.out, in this case we found elf dnl Linux has both elf and a.out, in this case we found elf
have_dl=yes have_dl=yes
, ,
have_dl=no) have_dl=no)
SO="so" SO="so"
SHLIB_LD="ld -shared -expect_unresolved '*'" SHLIB_LD="ld -shared -expect_unresolved '*'"
DO_SECOND_LD="" DO_SECOND_LD=""
fi fi
@@ -997,9 +997,9 @@ dnl Linux has both elf and a.out, in this case we found elf
;; ;;
*irix6*) *irix6*)
SHLIB_CFLAGS="$CFLAGS" SHLIB_CFLAGS="$CFLAGS"
SHLIB_CXXFLAGS="$CXXFLAGS" SHLIB_CXXFLAGS="$CXXFLAGS"
SO="so" SO="so"
DO_SECOND_LD="" DO_SECOND_LD=""
SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_CXX_LD="$SHLIB_LD" SHLIB_CXX_LD="$SHLIB_LD"
INSTALL_DLLS="" INSTALL_DLLS=""
@@ -1021,12 +1021,12 @@ dnl Linux has both elf and a.out, in this case we found elf
LIBS="$LIBS -ldl" LIBS="$LIBS -ldl"
fi fi
fi fi
SO="dylib" SO="dylib"
DO_SECOND_LD="" DO_SECOND_LD=""
if test "$dynamic_loading" = "yes" if test "$dynamic_loading" = "yes"
then then
SHLIB_LD="$CC -dynamiclib" SHLIB_LD="$CC -dynamiclib"
SHLIB_CXX_LD="$CXX -dynamiclib" SHLIB_CXX_LD="$CXX -dynamiclib"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(YAPLIBDIR)/\$@" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(YAPLIBDIR)/\$@"
INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
else else
@@ -1058,9 +1058,9 @@ dnl Linux has both elf and a.out, in this case we found elf
LDFLAGS="-Wl,--export-dynamic $LDFLAGS" LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
SHLIB_CFLAGS="-fPIC $CFLAGS" SHLIB_CFLAGS="-fPIC $CFLAGS"
SHLIB_CXXFLAGS="-fPIC $CXXFLAGS" SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"
SHLIB_LD="$CC -shared -export-dynamic" SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic" SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD="" DO_SECOND_LD=""
SO="so" SO="so"
INSTALL_DLLS="" INSTALL_DLLS=""
fi fi
@@ -1074,16 +1074,16 @@ dnl Linux has both elf and a.out, in this case we found elf
#an elf system #an elf system
LDFLAGS="-dynamic $LDFLAGS" LDFLAGS="-dynamic $LDFLAGS"
SHLIB_CFLAGS="-fPIC $CFLAGS" SHLIB_CFLAGS="-fPIC $CFLAGS"
SHLIB_CXXFLAGS="-fPIC $CXXFLAGS" SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"
SHLIB_LD="$CC -shared" SHLIB_LD="$CC -shared"
SHLIB_CXX_LD="$CXX -shared" SHLIB_CXX_LD="$CXX -shared"
DO_SECOND_LD="" DO_SECOND_LD=""
SO="so" SO="so"
INSTALL_DLLS="" INSTALL_DLLS=""
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
DYNYAPLIB=libYap."$SO" DYNYAPLIB=libYap."$SO"
if test "$dynamic_loading" = "yes" if test "$dynamic_loading" = "yes"
then then
YAPLIB_LD="\$(CC)" YAPLIB_LD="\$(CC)"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
@@ -1132,9 +1132,9 @@ dnl Linux has both elf and a.out, in this case we found elf
if test "$GCC" = "yes" if test "$GCC" = "yes"
then then
SHLIB_CXXFLAGS="-fPIC $CXXFLAGS" SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"
fi fi
fi fi
if test "$have_nsl" = yes if test "$have_nsl" = yes
then then
LIBS="$LIBS -lnsl" LIBS="$LIBS -lnsl"
fi fi