diff -Nru xlog-0.7rc2/acinclude.m4 xlog-0.7rc2-f8cfe/acinclude.m4 --- xlog-0.7rc2/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 +++ xlog-0.7rc2-f8cfe/acinclude.m4 2002-10-20 22:21:24.000000000 +0200 @@ -0,0 +1,57 @@ + +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + diff -Nru xlog-0.7rc2/configure.in xlog-0.7rc2-f8cfe/configure.in --- xlog-0.7rc2/configure.in 2002-07-29 22:06:32.000000000 +0200 +++ xlog-0.7rc2-f8cfe/configure.in 2002-10-20 22:32:52.000000000 +0200 @@ -65,9 +65,16 @@ [wanthamlib=false]) if test "x${wanthamlib}" != "xfalse"; then - AC_CHECK_LIB(hamlib,main,,AC_MSG_ERROR([Hamradio control libraries not found...])) - AC_CHECK_HEADERS(hamlib/rig.h,,AC_MSG_ERROR([Hamlib headers not found...])) - AC_DEFINE(WANT_HAMLIB, 1) + dnl First check through pkg-config, then fall back to standard way for old versions + PKG_CHECK_MODULES(HAMLIB, hamlib, [ + CFLAGS="$CFLAGS $HAMLIB_CFLAGS"; + LIBS="$LIBS $HAMLIB_LIBS"; + AC_DEFINE(WANT_HAMLIB, 1) + ], [ + AC_CHECK_LIB(hamlib,main,,AC_MSG_ERROR([Hamradio control libraries not found...])) + AC_CHECK_HEADERS(hamlib/rig.h,,AC_MSG_ERROR([Hamlib headers not found...])) + AC_DEFINE(WANT_HAMLIB, 1) + ]) echo "enabling hamlib support" else AC_DEFINE(WANT_HAMLIB, 0)