Various autoconf updates and fixes

diff --git a/admin/idl.m4 b/admin/idl.m4
index fea0eaa224b8907cfadc1b10c5a10cd06f947c0d..574087db724cd58ed1e5593bb52ea63033374439 100644 (file)
--- 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 66e5c3adbd5345abbccc1a0163966cb3544aafe1..86f3c443691583fc6024f2189f32b769777cac27 100644 (file)
--- 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