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

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

Ian Castle <ian...@op...> writes:

> I've put up openjade-1.3.2-rc1.tar.gz on the sourceforge download page.

[...]

> There are two new ./configure options
>
> --enable-spincludedir=<path to OpenSP include directory>
> --enable-splibdir=<path to directory which contains the OpenSP libosp
> library>

Okay, but I think it's desirable to check for /usr/local first
(background, it does not seem to link against libraries shipped with
SuSE Linux 8.1; thus I installed OpenSP 1.5pre8 into /usr/local on my
own); patch appended.

The problem is, it still wants to link against /usr/lib/libosp.so
instead of /usr/local/lib/libosp.so (I wrapped the lines):

g++ -O2 -I. -I./../include -I/usr/local/include/OpenSP -I./../grove
-I./../spgrove -I./../style -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\"
-DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\"
-DPACKAGE=\"openjade\" -DVERSION=\"1.3.2\" -DSTDC_HEADERS=1
-DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1
-DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1
-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1
-DHAVE_LIMITS_H=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1
-DSIZEOF_SIZE_T=4 -DSIZEOF_UNSIGNED_INT=4 -DSP_HAVE_LOCALE=1
-DSP_HAVE_WCHAR=1 -DSP_HAVE_GETTEXT=1 -DSIZE_T_IS_UINT=1
-DSP_HAVE_BOOL=1 -DSP_ANSI_CLASS_INST=1 -DJADE_MIF=1 -DJADE_HTML=1
-DSP_MULTI_BYTE=1 -DHAVE_DLFCN_H=1
-DDEFAULT_SCHEME_BUILTINS=\"/usr/local/share/builtins.dsl\" -o
.libs/openjade jade.o SgmlFOTBuilder.o RtfFOTBuilder.o HtmlFOTBuilder.o
TeXFOTBuilder.o TransformFOTBuilder.o MifFOTBuilder.o
../style/.libs/libostyle.so -L/home/ke/Projects/openjade-1.3.2/grove
-L/home/ke/Projects/openjade-1.3.2/grove/.libs
-L/home/ke/Projects/openjade-1.3.2/lib
-L/home/ke/Projects/openjade-1.3.2/lib/.libs
-L/home/ke/Projects/openjade-1.3.2/spgrove
-L/home/ke/Projects/openjade-1.3.2/spgrove/.libs /usr/lib/libospgrove.so
-L/usr/src/packages/BUILD/openjade-1.3.1/grove
-L/usr/src/packages/BUILD/openjade-1.3.1/grove/.libs
/usr/lib/libogrove.so -L/usr/src/packages/BUILD/openjade-1.3.1/lib
-L/usr/src/packages/BUILD/openjade-1.3.1/lib/.libs
../spgrove/.libs/libospgrove.so
/home/ke/Projects/openjade-1.3.2/grove/.libs/libogrove.so
/usr/lib/libosp.so ../grove/.libs/libogrove.so -lm

I'm wondering why does it know something about
/usr/src/packages/BUILD/openjade-1.3.1/grove, etc. ? 

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

	* config/configure.in (SPINCLUDEDIR): Try
	/usr/local/include/OpenSP first; check whether SPINCLUDEDIR
	exists.
	(SPLIBDIR): Make it depend on SPINCLUDEDIR.

diff -u openjade-1.3.2/config/configure.in.\~1\~ openjade-1.3.2/config/configure.in
--- 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
@@ -29,16 +29,26 @@
            AC_MSG_RESULT($enableval)
            SPINCLUDEDIR="$enableval"
 	 else
-	   AC_MSG_RESULT("/usr/include/OpenSP")
-	   SPINCLUDEDIR="/usr/include/OpenSP"
+           for d in /usr/local/include/OpenSP /usr/include/OpenSP; do
+	     AC_CHECK_FILE($d, [SPINCLUDEDIR="$d"; break])
+	   done
          fi],
-        [ AC_MSG_RESULT("/usr/include/OpenSP")
-          SPINCLUDEDIR="/usr/include/OpenSP"])
+        [for d in /usr/local/include/OpenSP /usr/include/OpenSP; do
+	   AC_CHECK_FILE($d, [SPINCLUDEDIR="$d"; break])
+	 done])
+if test x${SPINCLUDEDIR} = x; then
+  AC_MSG_ERROR("OpenSP include files do not exist")
+fi
 AC_SUBST(SPINCLUDEDIR)
- 
+
 dnl
 dnl Location of OpenSP library
 dnl
+if test $SPINCLUDEDIR = /usr/local/include/OpenSP; then
+  osplibdir=/usr/local/lib
+else
+  osplibdir=/usr/lib
+fi
 AC_MSG_CHECKING(location of OpenSP Library)
 AC_ARG_ENABLE(splibdir,
 [  --enable-splibdir=pathlist
@@ -48,11 +58,12 @@
            AC_MSG_RESULT($enableval)
            SPLIBDIR="$enableval"
 	 else
-	   AC_MSG_RESULT("/usr/lib")
-	   SPLIBDIR="/usr/lib"
+	   AC_MSG_RESULT($osplibdir)
+	   SPLIBDIR=$osplibdir
          fi],
-        [ AC_MSG_RESULT("/usr/lib")
-          SPLIBDIR="/usr/lib"])
+        [ AC_MSG_RESULT($osplibdir)
+          SPLIBDIR=$osplibdir])
+unset osplibdir
 
 AC_SUBST(SPLIBDIR)
 

Diff finished at Thu Oct 24 16:09:18


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