From bfa64813aabf19e9afaf43cd4d581e4a8b6e9bb8 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 19 Jan 2015 15:16:01 +0100
Subject: [PATCH] Various autoconf updates and fixes

---
 admin/idl.m4 | 3 ++-
 configure.ac | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/idl.m4 b/admin/idl.m4
index fea0eaa..574087d 100644
--- a/admin/idl.m4
+++ b/admin/idl.m4
@@ -35,7 +35,8 @@ AC_DEFUN([AM_ORTE_IDL],
         CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
 	LIBS="$LIBS $LIBIDL_LIBS"
 	#popt
-	AC_CHECK_LIB([popt], [poptSetOtherOptionHelp])
+	AC_CHECK_LIB([popt], [poptSetOtherOptionHelp],,
+			     [AC_MSG_ERROR([orte-idl requires popt library])])
   fi
 
   AM_CONDITIONAL(CONFIG_ORTE_IDL, [test $USE_ORTE_IDL = yes])
diff --git a/configure.ac b/configure.ac
index 66e5c3a..86f3c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ AC_CANONICAL_TARGET
 AC_CONFIG_HEADER(orte/include/orte/orte_config.h)
 AM_INIT_AUTOMAKE(no-define)
 
+AC_CONFIG_MACRO_DIR([admin])
 
 # Activate maintainer mode
 AM_MAINTAINER_MODE
@@ -113,6 +114,7 @@ fi
 AC_PROG_CC
 AM_PROG_CC_C_O
 LT_INIT([win32-dll])
+PKG_PROG_PKG_CONFIG()
 
 ###############################
 # Checks for ability to compile ORTE_IDL
-- 
2.39.2