mpg123-1.33.1

configure.ac

@@ -80,6 +80,13 @@ dnl Testing with 1.14.
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_HEADERS([src/config.h])
 
+dnl You tell me how quoting this normally would work to avoid expansion!
+if test 2 -lt "$(grep "PKG_"CHECK_MODULES "$0"|wc -l)"; then
+  AC_MSG_ERROR([Pkg-config was absent when generating this configure script.
+  Re-run autoreconf with pkg-config installed top get a working one.])
+fi
+dnl For some reason, this has to be after the check above.
+PKG_PROG_PKG_CONFIG([])
 
 # You get strange symptoms like jack module build failing because the AC_C_CONST failed to detect the working const support.
 # In that case, the test failed because -Werror, not because no const there...
@@ -1471,7 +1478,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 void *v = &ReadConsoleInput;
 ])],[ac_cv_header_wincon_h=yes],[ac_cv_header_wincon_h=no])
 AC_MSG_RESULT([$ac_cv_header_wincon_h])
-AS_IF([test "x$ac_cv_header_wincon_h" = "xyes"],[],[AC_DEFINE([HAVE_WINCON_H],[1],[Define to 1 if you have the <wincon.h> header file.])])
+AS_IF([test "x$ac_cv_header_wincon_h" = "xyes"],[AC_DEFINE([HAVE_WINCON_H],[1],[Define to 1 if you have the <wincon.h> header file.])],[])
 
 term_type=none
 if test "x$ac_cv_sys_posix_termios" = "xyes"; then
@@ -1926,8 +1933,6 @@ if test "x$build_libout123" = xyes && ! echo "$check_modules" | grep -qw dummy;
 	check_modules="$check_modules dummy"
 fi
 
-PKG_PROG_PKG_CONFIG([])
-
 # Now go through the modules to check and do the chores.
 for m in $check_modules
 do