patches/geda-gschem/01-Use-pkg-config-support-for-Guile-if-present.patch

   1 diff --git a/configure.ac.in b/configure.ac.in
   2 index 13df721..1febc45 100644
   3 --- a/configure.ac
   4 +++ b/configure.ac
   5 @@ -91,7 +91,28 @@ fi
   6
   7  ############################################################################
   8  # Check for guile start
   9 -GUILE_FLAGS
  10 +#
  11 +
  12 +# Check for pkg-config
  13 +AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
  14 +if test $PKG_CONFIG = no; then
  15 +   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
  16 +fi
  17 +
  18 +PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
  19 +
  20 +if test "$GUILE_PC" = "yes"
  21 +then
  22 +
  23 +   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
  24 +
  25 +else
  26 +
  27 +  # Find about the installed guile
  28 +  GUILE_FLAGS
  29 +  GUILE_VERSION=`$GUILE_CONFIG info guileversion`
  30 +
  31 +fi
  32
  33  # Check Guile version
  34  guile_need_major=1
  35 @@ -99,7 +120,6 @@ guile_need_minor=6
  36  guile_need_version="$guile_need_major[].$guile_need_minor.0"
  37
  38  AC_MSG_CHECKING([Guile version >= $guile_need_version])
  39 -GUILE_VERSION=`$GUILE_CONFIG info guileversion`
  40
  41  guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
  42  guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
  43 @@ -234,12 +254,6 @@ fi
  44  # Check for gtk+ 2.4 start
  45  #
  46
  47 -# Check for pkg-config
  48 -AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
  49 -if test $PKG_CONFIG = no; then
  50 -   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
  51 -fi
  52 -
  53  PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
  54
  55  # This next bit of code figures out what gtk we need to use.