[Yap-commits] CVS: changes-5.1.html, 1.220, 1.221 configure, 1.142, 1.143 configure.in, 1.140, 1.141

[Vitor S. C. <vs...@us...>]

Update of /cvsroot/yap
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9792

Modified Files:
	changes-5.1.html configure configure.in 
Log Message:
DESTDIR fixes


Index: configure
===================================================================
RCS file: /cvsroot/yap/configure,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- configure	19 Jun 2008 21:09:56 -0000	1.142
+++ configure	12 Aug 2008 22:04:49 -0000	1.143
@@ -689,6 +689,7 @@
 CPLINT_LDFLAGS
 CPLINT_SHLIB_LD
 ENABLE_CPLINT
+EXTEND_DYNLOADER_PATH
 M4
 M4GENHDRS
 INSTALL_DLLS
@@ -3097,7 +3098,6 @@
 fi
 
 
-
 if test "$tabling" = yes -o "$orparallelism" = yes -o "$threads" = yes
 then
   cat >>confdefs.h <<\_ACEOF
@@ -7124,10 +7124,14 @@
   YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS"
   CROSS_SIMULATOR="LD_LIBRARY_PATH=."
   case "$target_os" in
+  *cygwin*!*mingw32*)
+    EXTEND_DYNLOADER_PATH=""
+    ;;
   *darwin*)
     DYNYAPLIB=libYap"$SHLIB_SUFFIX"
     YAPLIB="$DYNYAPLIB"
     DYNLIB_LD="gcc -dynamiclib"
+    EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR)/Yap YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
     ;;
   *)
        case "$target_cpu" in
@@ -7141,6 +7145,7 @@
         JAVA_TARGET=sparc
         ;;
        esac
+    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(DESTDIR)$(LIBDIR): YAPSHAREDIR=$(DESTDIR)$(SHAREDIR)"
     LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib  -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET"
     DYNYAPLIB=libYap"$SHLIB_SUFFIX"
     YAPLIB="$DYNYAPLIB"
@@ -7148,6 +7153,7 @@
     ;;
   esac
 else
+  EXTEND_DYNLOADER_PATH="YAPSHAREDIR=$(DESTDIR)$(SHAREDIR)"
   DYNYAPLIB=libYap.notused
 fi
 
@@ -7521,6 +7527,7 @@
 fi
 
 
+
 # LAM
 OLD_CC=${CC}
 CC=${LAM_MPI_CC}
@@ -16902,6 +16909,7 @@
 CPLINT_LDFLAGS!$CPLINT_LDFLAGS$ac_delim
 CPLINT_SHLIB_LD!$CPLINT_SHLIB_LD$ac_delim
 ENABLE_CPLINT!$ENABLE_CPLINT$ac_delim
+EXTEND_DYNLOADER_PATH!$EXTEND_DYNLOADER_PATH$ac_delim
 M4!$M4$ac_delim
 M4GENHDRS!$M4GENHDRS$ac_delim
 INSTALL_DLLS!$INSTALL_DLLS$ac_delim
@@ -16922,7 +16930,6 @@
 JAR!$JAR$ac_delim
 IN_UNIX!$IN_UNIX$ac_delim
 YAPMPILIB!$YAPMPILIB$ac_delim
-LAM_MPI_CC!$LAM_MPI_CC$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -16964,6 +16971,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+LAM_MPI_CC!$LAM_MPI_CC$ac_delim
 MPI_OBJS!$MPI_OBJS$ac_delim
 MPI_LIBS!$MPI_LIBS$ac_delim
 INSTALL_COMMAND!$INSTALL_COMMAND$ac_delim
@@ -16982,7 +16990,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Index: configure.in
===================================================================
RCS file: /cvsroot/yap/configure.in,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- configure.in	19 Jun 2008 21:09:29 -0000	1.140
+++ configure.in	12 Aug 2008 22:04:50 -0000	1.141
@@ -261,7 +261,6 @@
 	fi,
 	[yap_cv_max_threads="1024"])
 
-
 if test "$tabling" = yes -o "$orparallelism" = yes -o "$threads" = yes
 then
   AC_DEFINE(MinHeapSpace, (1000*SIZEOF_INT_P))
@@ -854,10 +853,14 @@
   YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS"
   CROSS_SIMULATOR="LD_LIBRARY_PATH=."
   case "$target_os" in
+  *cygwin*!*mingw32*)
+    EXTEND_DYNLOADER_PATH=""
+    ;;
   *darwin*)
     DYNYAPLIB=libYap"$SHLIB_SUFFIX"
     YAPLIB="$DYNYAPLIB"
     DYNLIB_LD="gcc -dynamiclib"
+    EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR)/Yap YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
     ;;
   *)
        case "$target_cpu" in
@@ -871,6 +874,7 @@
         JAVA_TARGET=sparc
         ;;
        esac
+    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(DESTDIR)$(LIBDIR): YAPSHAREDIR=$(DESTDIR)$(SHAREDIR)"
     LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib  -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET"
     DYNYAPLIB=libYap"$SHLIB_SUFFIX"
     YAPLIB="$DYNYAPLIB"
@@ -878,6 +882,7 @@
     ;;
   esac
 else
+  EXTEND_DYNLOADER_PATH="YAPSHAREDIR=$(DESTDIR)$(SHAREDIR)"
   DYNYAPLIB=libYap.notused
 fi
 
@@ -992,6 +997,7 @@
 	ENABLE_CPLINT="#"
 fi
 AC_SUBST(ENABLE_CPLINT)
+AC_SUBST(EXTEND_DYNLOADER_PATH)
 
 # LAM
 OLD_CC=${CC}