ANDROID: set min. Android version to 2.3.3

[orte.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9693f7eef59886e3c0e79f9b38e1eefe1b5d2890..ede98b1ad2dd27a3671d2ef365c86e5030e15d0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,9 @@
 
 # autoconf requirement
 
-AC_PREREQ([2.56])
+AC_PREREQ([2.69])
 
-AC_INIT([orte],[0.3.3],[orte@rtime.felk.cvut.cz], [], [http://orte.sf.net])
+AC_INIT([orte],[0.3.3],[orte@rtime.felk.cvut.cz],[],[http://orte.sf.net])
 AC_CONFIG_AUX_DIR(admin)
 
 ###############################
@@ -77,7 +77,7 @@ case "$target" in
     ;;
   *)
     # Assume a Unix.
-    if test -z ${CONFIG_ORTE_RT} -a ${CONFIG_ORTE_KERNEL} ; then
+    if test -z "${CONFIG_ORTE_RT}" -a "${CONFIG_ORTE_KERNEL}" ; then
       UNIX='yes'
       AC_DEFINE([CONFIG_ORTE_UNIX],[1],[Define if is target a unix system])
     fi
@@ -106,7 +106,7 @@ else
   if test ${USE_RTAI} == 'yes' ; then
     CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
   else
-    if test -n ${CONFIG_ORTE_KERNEL} ; then
+    if test -n "${CONFIG_ORTE_KERNEL}" ; then
       CFLAGS="$CFLAGS $LINUX_CFLAGS"
     fi
   fi
@@ -117,7 +117,7 @@ fi
 # Initialize libtool
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])
 
 ###############################
 # Checks for ability to compile ORTE_IDL
@@ -129,7 +129,7 @@ AM_JORTE
 
 ###############################
 # Checks for libraries and init libtools
-if test -z ${CONFIG_ORTE_RT} ; then
+if test -z "${CONFIG_ORTE_RT}" ; then
   AC_CHECK_LIB([ws2_32], [main])
   AC_CHECK_LIB([socket], [main])
   AC_CHECK_LIB([nsl], [main])
@@ -137,7 +137,7 @@ if test -z ${CONFIG_ORTE_RT} ; then
   AC_CHECK_LIB(pthread, pthread_create, ,
          AC_CHECK_LIB(c_r, pthread_create, ,
               if test ${MINGW} == 'yes' ; then
-                     LIBS=$LIBS' -L$(top_srcdir)/orte/contrib/win_pthread/ -lpthread'
+                     INTERNAL_PTHREAD_LIBS=' -L$(top_srcdir)/orte/contrib/win_pthread/ -lpthread'
                      AC_MSG_NOTICE([Using internal version of pthreads!!!])
               else
                      AC_MSG_ERROR([Can't compile without pthreads!!!])
@@ -187,7 +187,7 @@ if test ${WIN} == 'yes' ; then
     AC_CHECK_FUNCS([gettimeofday])
 fi
 # kernel
-if test ${CONFIG_ORTE_KERNEL} == 'yes' ; then
+if test "${CONFIG_ORTE_KERNEL}" == 'yes' ; then
     AC_CHECK_HEADERS([\
     asm/byteorder.h linux/ctype.h linux/string.h \
     linux/module.h linux/if.h linux/socket.h \
@@ -320,8 +320,8 @@ AC_C_INLINE
 ###############################
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
-if test -z ${CONFIG_ORTE_RT} ; then
-AC_CHECK_FUNCS([gethostbyname getopt_long])
+if test -z "${CONFIG_ORTE_RT}" ; then
+AC_CHECK_FUNCS([gethostbyname getopt_long sigwaitinfo])
 fi
 
 AC_CONFIG_FILES([Makefile
@@ -340,10 +340,12 @@ AC_CONFIG_FILES([Makefile
                 orte/libjorte/Makefile
                  orte/manager/Makefile])
 
+LIBS="$LIBS$INTERNAL_PTHREAD_LIBS"
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 modtool
 ])
+AC_OUTPUT
 chmod +x modtool
 
 # ======================================================================