diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/autogen.sh | 6 | ||||
| -rw-r--r-- | macros/gnome-guile-checks.m4 | 15 |
3 files changed, 23 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 4b2db43891..eb0be95f8d 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +2001-08-02 J.H.M. Dassen (Ray) <jdassen@debian.org> + + * gnome-guile-checks.m4: Made "--without-guile" work. Added $guile_msg + for reporting back. + 2001-07-24 Jody Goldberg <jgoldberg@home.com> * psiconv.m4 : Add psion macros from Frodo Looijaard <frodol@dds.nl> diff --git a/macros/autogen.sh b/macros/autogen.sh index bcf985f846..718d3d9498 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -9,7 +9,7 @@ if [ -n "$GNOME2_PATH" ]; then export PATH fi -(autoconf --version) < /dev/null > /dev/null 2>&1 || { +(autoconf2.50 --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME." echo "Download the appropriate package for your distribution," @@ -176,8 +176,8 @@ do echo "Running automake --gnu $am_opt ..." automake --add-missing --gnu $am_opt || { echo "**Error**: automake failed."; exit 1; } - echo "Running autoconf ..." - autoconf || { echo "**Error**: autoconf failed."; exit 1; } + echo "Running autoconf2.50 ..." + autoconf2.50 || { echo "**Error**: autoconf failed."; exit 1; } ) || exit 1 fi done diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4 index 1086d30a4e..102351cffd 100644 --- a/macros/gnome-guile-checks.m4 +++ b/macros/gnome-guile-checks.m4 @@ -6,6 +6,18 @@ dnl AC_DEFUN([GNOME_CHECK_GUILE], [ +dnl AC_MSG_WARN([Withval is: $withval]) + guile_msg = 'Huh?' +if test x$withval = xno ; then + guile_msg = 'disabled' + GUILE_LIBS= + GUILE_INCS= + AC_SUBST(GUILE_LIBS) + AC_SUBST(GUILE_INCS) + AM_CONDITIONAL(GUILE, /bin/false) +else + guile_msg="no" + saved_ldflags="$LDFLAGS" saved_cppflags="$CPPFLAGS" LDFLAGS="$LDFLAGS $GNOME_LIBDIR" @@ -100,6 +112,8 @@ AC_DEFUN([GNOME_CHECK_GUILE], ]) AC_MSG_RESULT($ac_cv_guile_found) + guile_msg=$ac_cv_guile_found + if test x$ac_cv_guile_found = xno ; then if test x$1 = xfail ; then AC_MSG_ERROR(Can not find Guile on this system) @@ -116,4 +130,5 @@ AC_DEFUN([GNOME_CHECK_GUILE], AC_SUBST(GUILE_LIBS) AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes) +fi ]) |