[Crystal-cvs] CS/scripts/cs-config cs-config.temppost,1.46,1.47 Jamfile,1.15,1.16

[<re...@us...>]

Update of /cvsroot/crystal/CS/scripts/cs-config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30711/scripts/cs-config

Modified Files:
	cs-config.temppost Jamfile 
Log Message:
res made CRYSTAL be treated like a list of paths.

Index: cs-config.temppost
===================================================================
RCS file: /cvsroot/crystal/CS/scripts/cs-config/cs-config.temppost,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cs-config.temppost	3 Aug 2004 00:35:13 -0000	1.46
+++ cs-config.temppost	18 Feb 2005 19:12:19 -0000	1.47
@@ -10,6 +10,22 @@
 elif test -z "$libdir" && test -r "${exec_prefix}/lib/libcsutil.a"; then
     libdir="${exec_prefix}/lib"
     lflags="-L${exec_prefix}/lib"
+else
+    my_IFS=$IFS; IFS=$PATH_SEPARATOR
+    for p in $CRYSTAL
+    do
+	if test -r "$p/Jamfile" && \
+	    test -r "$p/$makeout/libs/csutil/libcsutil.a"; then
+	    libdir="$p/$makeout/libs"
+	    lflags="-L$libdir/csutil -L$libdir/cstool -L$libdir/csgfx -L$libdir/csgeom -L$libdir/csws"
+	    break
+	elif test -z "$libdir" && test -r "${p}/lib/libcsutil.a"; then
+	    libdir="${exec_prefix}/lib"
+	    lflags="-L${exec_prefix}/lib"
+	    break
+	fi
+    done
+    IFS=$my_IFS
 fi
 
 usage()

Index: Jamfile
===================================================================
RCS file: /cvsroot/crystal/CS/scripts/cs-config/Jamfile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Jamfile	3 Aug 2004 00:35:13 -0000	1.15
+++ Jamfile	18 Feb 2005 19:12:19 -0000	1.16
@@ -58,18 +58,41 @@
   cat $(SUBDIR)/cs-config.temppre > $(<)
 
   cat >> $(<) << __END__
+# From autoconf:
+# The user is always right.
+if test "\${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf\$\$.sh
+  echo  "exit 0"   >>conf\$\$.sh
+  chmod +x conf\$\$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf\$\$.sh
+fi
+
 CRYSTAL="\${CRYSTAL-$(prefix)}"
-prefix="\${CRYSTAL}"
-exec_prefix="\${prefix}"
-makeout="$(LOCATE.OBJECTS)"
-version="$(PACKAGE_VERSION)"
-longversion="$(PACKAGE_STRING)"
-# try to determine if we're in a source or installed CS version
-if [ -r \${prefix}/include/$(PACKAGE_NAME)/cssysdef.h ] ; then
-  includedir="\${prefix}/include/$(PACKAGE_NAME)"
-elif [ -r \${prefix}/include/cssysdef.h ] ; then
-  includedir="\${prefix}/include"
-else
+my_IFS=\$IFS; IFS=\$PATH_SEPARATOR
+for p in \$CRYSTAL
+do
+  prefix="\${p}"
+  exec_prefix="\${prefix}"
+  makeout="$(LOCATE.OBJECTS)"
+  version="$(PACKAGE_VERSION)"
+  longversion="$(PACKAGE_STRING)"
+  # try to determine if we're in a source or installed CS version
+  if [ -r \${prefix}/include/$(PACKAGE_NAME)/cssysdef.h ] ; then
+    includedir="\${prefix}/include/$(PACKAGE_NAME)"
+    break
+  elif [ -r \${prefix}/include/cssysdef.h ] ; then
+    includedir="\${prefix}/include"
+    break
+  fi
+done
+IFS=\$my_IFS
+if test "x\$includedir" = "x"
+then
   includedir="$(appincdir)"
 fi
 syslibs=" $(LINKLIBS) "