[gnome-guile] Patch in order to find guile

[Martin Baulig <norwegen home-of-linux org>]

Hi,

this is the second patch - it's for gnome-guile and uses the new
GNOME_GUILE_CHECKS(fail) I sent to the list in my last mail.

Martin

----------------------------------------------------------------
   Martin Baulig - Angewandte Mathematik - Universitaet Trier
   
   baulig@castor.uni-trier.de, http://www.home-of-linux.com/
   Key: 1024-bit key with ID C8178435 created 1997/01/24 
   ID:  67 C1 84 A0 47 F5 11 C5  5F 68 4C 84 99 05 C3 92
   Finger baulig@math38 or fetch mykey.asc from the url above
-----------------------------------------------------------------
? gnome-guile.diff
Index: ChangeLog
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/ChangeLog,v
retrieving revision 1.12
diff -r1.12 ChangeLog
0a1,5
> Sun Apr 26 14:21:17 UTC 1998  Martin Baulig  <martin@home-of-linux.org>
> 
> 	* configure.in: GNOME_CHECK_GUILE(fail) - let it abort if
> 	guile cannot be found.
> 
Index: acconfig.h
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/acconfig.h,v
retrieving revision 1.3
diff -r1.3 acconfig.h
5a6
> #undef HAVE_GUILE
Index: configure.in
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/configure.in,v
retrieving revision 1.5
diff -r1.5 configure.in
11c11
< GNOME_CHECK_GUILE
---
> GNOME_CHECK_GUILE(fail)
Index: ChangeLog
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/guile-gtk/ChangeLog,v
retrieving revision 1.24
diff -r1.24 ChangeLog
0a1,4
> Sun Apr 26 14:21:17 UTC 1998  Martin Baulig  <martin@home-of-linux.org>
> 
> 	* configure.in: now using GNOME_GUILE_CHECKS(fail) to find guile.
> 
Index: acconfig.h
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/guile-gtk/acconfig.h,v
retrieving revision 1.1
diff -r1.1 acconfig.h
2a3
> #undef HAVE_GUILE
Index: config.h.in
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/guile-gtk/config.h.in,v
retrieving revision 1.5
diff -r1.5 config.h.in
7a8
> #undef HAVE_GUILE
Index: configure.in
===================================================================
RCS file: /debian/home/gnomecvs/gnome-guile/guile-gtk/configure.in,v
retrieving revision 1.5
diff -r1.5 configure.in
13,78c13
< 
< AC_CHECK_PROG(BUILD_GUILE, build-guile, yes, no)
< 
< if test $BUILD_GUILE = yes; then
<   AC_MSG_CHECKING(whether build-guile works)
<   if test x`build-guile --version >/dev/null 2>&1 || echo no` = xno; then
<     BUILD_GUILE=no
<   fi
<   AC_MSG_RESULT($BUILD_GUILE)
< fi
< 
< AC_CHECK_LIB(m, sin)
< 
< if test $BUILD_GUILE = yes; then
<   AC_MSG_CHECKING(for guile libraries)
<   GUILE_LIBS=`build-guile link`
<   AC_MSG_RESULT($GUILE_LIBS)
< else
<   GUILE_LIBS=""
<   AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS")
<   AC_CHECK_LIB(qt, main, GUILE_LIBS="-lqt $GUILE_LIBS")
<   AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS")
<   GUILE_LIBS="-lguile $GUILE_LIBS"
< fi
< AC_SUBST(GUILE_LIBS)
< 
< #HELP!
< dnl try to find guile headers
< AC_DEFUN(AC_FIND_GUILE_H,
< [  for ac_dir in              	\
<     /usr/local/include/         \
<     /usr/gnu/include     	\
<     /usr/guile/include        	\
<     /opt/gnu/include            \
<     ; \
<   do
<     if test -r "$ac_dir/guile/gh.h"; then
<       G_CFLAGS="-I$ac_dir"
<       break
<     fi
<   done
< ])
< AC_MSG_CHECKING(for guile headers)
< AC_FIND_GUILE_H
< AC_MSG_RESULT($G_CFLAGS)
< 
< dnl try to find guile libs
< AC_DEFUN(AC_FIND_GUILE_LIB,
< [  for ac_dir in      \
<     /usr/local/lib    \
<     /opt/gnu/lib      \
<     ; \
<   do
<     if test -r "$ac_dir/libguile.a"; then
<       G_LIBS="-L$ac_dir"
<       break
<     fi
<     if test -r "$ac_dir/libguile.so"; then
<       G_LIBS="-L$ac_dir"
<       break
<     fi
<   done
< ])
< AC_MSG_CHECKING(for guile libs)
< AC_FIND_GUILE_LIB
< AC_MSG_RESULT($G_LIBS)
---
> GNOME_CHECK_GUILE(fail)

PGP signature