Patch for macros/gnome-guile-checks.m4 (GNOME_CHEK_GUILE)

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

Hi,

this is a short patch for macros/gnome-guile-check.m4. It lets
GNOME_CHECK_GUILE also look in GUILE_LIBS (in cases where guile
is installed at the same location where gnome is) and has an
optional failflags: GNOME_CHECK_GUILE(fail) will abort if guile
cannot be found.

Martin

====>

1998-04-09  Martin Baulig <martin@home-of-linux.org>

	* gnome-guile-checks.m4 (GNOME_CHECK_GUILE): Looks also in $GNOME_LIBDIR;
	added failflag: GNOME_CHECK_GUILE(fail) will abort if guile cannot be found.

----------------------------------------------------------------
   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
-----------------------------------------------------------------
Index: ChangeLog
===================================================================
RCS file: /debian/home/gnomecvs/gnome-common/macros/ChangeLog,v
retrieving revision 1.31
diff -c -r1.31 ChangeLog
*** ChangeLog	1998/04/01 03:48:14	1.31
--- ChangeLog	1998/04/09 10:18:13
***************
*** 1,3 ****
--- 1,8 ----
+ 1998-04-09  Martin Baulig <martin@home-of-linux.org>
+ 
+ 	* gnome-guile-checks.m4 (GNOME_CHECK_GUILE): Looks also in $GNOME_LIBDIR;
+ 	added failflag: GNOME_CHECK_GUILE(fail) will abort if guile cannot be found.
+ 
  1998-03-31  Raja R Harinath  <harinath@cs.umn.edu>
  
  	* gnome-support.m4 (AC_REPLACE_FUNCS): Look for vasprintf.
Index: gnome-guile-checks.m4
===================================================================
RCS file: /debian/home/gnomecvs/gnome-common/macros/gnome-guile-checks.m4,v
retrieving revision 1.1
diff -c -r1.1 gnome-guile-checks.m4
*** gnome-guile-checks.m4	1998/02/11 01:37:05	1.1
--- gnome-guile-checks.m4	1998/04/09 10:18:13
***************
*** 1,5 ****
--- 1,14 ----
+ dnl
+ dnl GNOME_CHECK_GUILE (failflag)
+ dnl
+ dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found.
+ dnl
+ 
  AC_DEFUN([GNOME_CHECK_GUILE],
  [
+ 	saved_ldflags="$LDFLAGS"
+ 	LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
+ 
  	AC_CHECK_LIB(qthreads,main,[
  	QTTHREADS_LIB="-lqthreads"
  	AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap")
***************
*** 15,23 ****
--- 24,40 ----
  	    GUILE_LIBS="-lguile"
  	    ac_cv_guile_found=yes
  	],[
+ 	    if test x$1 = xfail ; then
+ 		AC_MSG_ERROR(Can not find Guile 1.2 on this system)
+ 	    else
+ 		AC_MSG_WARN(Can not find Guile 1.2 on this system)
+ 	    fi
  	    AC_MSG_WARN(Can not find Guile 1.2 on the system)
  	    ac_cv_guile_found=no
  	], $QTTHREADS_LIB $LIBS)
+ 
+ 	LDFLAGS="$saved_ldflags"
+ 
  	AC_SUBST(GUILE_LIBS)
  	AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes)
  ])

PGP signature