patch-configure 1.2 KB

12345678910111213141516171819202122232425262728
  1. $OpenBSD: patch-configure,v 1.2 2014/09/28 13:44:48 ajacoutot Exp $
  2. Do not pick up guile2 until our devel/swig is also built against lang/guile2.
  3. (i.e. force guile-1.8 support for now)
  4. Fix regex in guile detection.
  5. --- configure.orig2 Sun Jan 12 00:15:44 2014
  6. +++ configure Sun Sep 28 15:30:06 2014
  7. @@ -21055,7 +21055,7 @@ else
  8. if test `$SWIG -help 2>&1 | $EGREP -c '\-guile *- Generate'` = 0; then
  9. use_guile="No (swig does not support -guile option)"
  10. else
  11. - for ac_prog in guile2 guile1.8 guile
  12. + for ac_prog in guile1.8 guile
  13. do
  14. # Extract the first word of "$ac_prog", so it can be a program name with args.
  15. set dummy $ac_prog; ac_word=$2
  16. @@ -21100,7 +21100,7 @@ done
  17. if test "x$GUILE" = "x"; then
  18. use_guile="No (guile not available)"
  19. else
  20. - GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
  21. + GUILE_VERSION=`$GUILE --version | sed -n '1 s/^Guile \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$/\1/ p'`
  22. GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
  23. GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
  24. if test 0$GUILE_VERSION_MAJOR -lt 2; then