[OpenJade-devel] Re: SPINCLUDEDIR/SPLIBDIR (2) (Re: OpenJade Release 1.3.2 - Release Candidate)

[Karl E. <ke...@gm...>]

Karl Eichwalder <ke...@gm...> writes:

> --- openjade-1.3.2/config/configure.in.~1~	2002-10-20 23:47:24.000000000 +0200
> +++ openjade-1.3.2/config/configure.in	2002-10-24
> 15:31:19.000000000 +0200

Here is an improvement (to be applied after my previous patch)

2002-10-25  Karl Eichwalder  <ke...@su...>

        * config/configure.in (SPINCLUDEDIR): Check for
        ${prefix}/include/OpenSP first.

diff -u openjade-1.3.2/config/configure.in.\~2\~ openjade-1.3.2/config/configure.in
--- openjade-1.3.2/config/configure.in.~2~	2002-10-24 15:31:19.000000000 +0200
+++ openjade-1.3.2/config/configure.in	2002-10-25 08:42:47.000000000 +0200
@@ -29,11 +29,13 @@
            AC_MSG_RESULT($enableval)
            SPINCLUDEDIR="$enableval"
 	 else
-           for d in /usr/local/include/OpenSP /usr/include/OpenSP; do
+           for d in ${prefix}/include/OpenSP /usr/local/include/OpenSP \
+             /usr/include/OpenSP; do
 	     AC_CHECK_FILE($d, [SPINCLUDEDIR="$d"; break])
 	   done
          fi],
-        [for d in /usr/local/include/OpenSP /usr/include/OpenSP; do
+        [for d in ${prefix}/include/OpenSP /usr/local/include/OpenSP \
+           /usr/include/OpenSP; do
 	   AC_CHECK_FILE($d, [SPINCLUDEDIR="$d"; break])
 	 done])
 if test x${SPINCLUDEDIR} = x; then
@@ -44,11 +46,11 @@
 dnl
 dnl Location of OpenSP library
 dnl
-if test $SPINCLUDEDIR = /usr/local/include/OpenSP; then
-  osplibdir=/usr/local/lib
-else
-  osplibdir=/usr/lib
-fi
+case "${SPINCLUDEDIR}" in
+  ${prefix}/include/OpenSP) osplibdir=${prefix}/lib ;;
+  /usr/local/include/OpenSP) osplibdir=/usr/local/lib ;;
+  *) osplibdir=/usr/lib ;;
+esac
 AC_MSG_CHECKING(location of OpenSP Library)
 AC_ARG_ENABLE(splibdir,
 [  --enable-splibdir=pathlist

Diff finished at Fri Oct 25 08:47:24

-- 
ke...@su... (work) / ke...@gm... (home):              |
http://www.suse.de/~ke/                                  |      ,__o
Free Translation Project:                                |    _-\_<,
http://www.iro.umontreal.ca/contrib/po/HTML/             |   (*)/'(*)