# Check for contrib directory
if test -d extras/contrib/bin; then
export PATH=./extras/contrib/bin:$PATH
- ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+ if test -d extras/contrib/share/aclocal; then
+ ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+ fi
if test ".`uname -s`" = ".Darwin"; then
export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
EOF
if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
-dnl User does not have pkg-config, so this is a no-op
-AC_DEFUN([PKG_CHECK_MODULES], [:], [], [], [])
+dnl User does not have pkg-config, so assume package was not found
+AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
EOF
fi