# 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.4],[orte@rtime.felk.cvut.cz],[],[http://orte.sf.net])
AC_CONFIG_AUX_DIR(admin)
###############################
ORTE_MAJOR_VERSION=0
ORTE_MINOR_VERSION=3
ORTE_MICRO_VERSION=3
-ORTE_INTERFACE_AGE=0
-ORTE_BINARY_AGE=0
ORTE_VERSION=$ORTE_MAJOR_VERSION.$ORTE_MINOR_VERSION.$ORTE_MICRO_VERSION
AC_SUBST(ORTE_MAJOR_VERSION)
AC_SUBST(ORTE_MINOR_VERSION)
AC_SUBST(ORTE_MICRO_VERSION)
AC_SUBST(ORTE_VERSION)
-AC_SUBST(ORTE_INTERFACE_AGE)
-AC_SUBST(ORTE_BINARY_AGE)
-#Libtool versioning
-ORTE_MICRO_VERSION_NUM=`echo $ORTE_MICRO_VERSION | sed 's/[[a-zA-Z]]//g'`
-LT_RELEASE=$ORTE_MAJOR_VERSION.$ORTE_MINOR_VERSION
-LT_CURRENT=`expr $ORTE_MICRO_VERSION_NUM - $ORTE_INTERFACE_AGE`
-LT_REVISION=$ORTE_INTERFACE_AGE
-LT_AGE=`expr $ORTE_BINARY_AGE - $ORTE_INTERFACE_AGE`
-AC_SUBST(LT_RELEASE)
+
+# Libtool versioning (see libtool manual)
+
+LT_CURRENT=1 # This will be part of SONAME
+LT_REVISION=0
+LT_AGE=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
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
;;
*)
# 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
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
# Initialize libtool
AC_PROG_CC
AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])
+PKG_PROG_PKG_CONFIG()
###############################
# Checks for ability to compile ORTE_IDL
###############################
# 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])
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!!!])
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 \
###############################
# 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
orte/libjorte/Makefile
orte/manager/Makefile])
+LIBS="$LIBS$INTERNAL_PTHREAD_LIBS"
-AC_OUTPUT([
+AC_CONFIG_FILES([
modtool
])
+AC_OUTPUT
chmod +x modtool
# ======================================================================