From 8e61b98c5e2943b149c825310b24e714a6127072 Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Mon, 23 Jan 2012 08:53:41 +0100
Subject: Imported Upstream version 2.1.4

---
 configure.in | 58 ++++++++--------------------------------------------------
 1 file changed, 8 insertions(+), 50 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 1d85fa9..8679c90 100644
--- a/configure.in
+++ b/configure.in
@@ -272,9 +272,7 @@ AC_C_VOLATILE
 #  PGM extension
 ac_zmq_pgm_ext="no"
 
-pgm_basename="libpgm-5.1.114~dfsg"
-
-AC_SUBST(pgm_basename)
+pgm_basename="libpgm-5.1.115~dfsg"
 
 AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], 
     [build libzmq with PGM extension [default=no]])], 
@@ -310,6 +308,9 @@ if test "x$with_pgm_ext" != "xno"; then
         mkdir foreign/openpgm/build-staging/openpgm/pgm/config
     fi
 
+    pgm_subdir=build-staging/openpgm/pgm
+    AC_SUBST(pgm_subdir)
+
     AC_SUBST(pgm_srcdir)
     AC_CONFIG_SUBDIRS([foreign/openpgm/build-staging/openpgm/pgm/])
 
@@ -318,6 +319,8 @@ if test "x$with_pgm_ext" != "xno"; then
     ac_zmq_pgm_ext="yes"
 fi
 
+AC_SUBST(pgm_basename)
+
 # Set -Wall, -Werror and -pedantic
 AC_LANG_PUSH([C++])
 
@@ -341,52 +344,6 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
 AC_CHECK_HEADERS([alloca.h])
 
-if test "x$with_pgm_ext" != "xno"; then
-
-    # Check additional functions for PGM build
-    AC_CHECK_FUNCS(poll epoll_create pselect getopt vasprintf getprotobyname_r2 getprotobyname_r)
-
-    if test "x$ac_cv_func_gettimeofday" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETTIMEOFDAY $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_func_getprotobyname_r2" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETPROTOBYNAME_R2 $LIBZMQ_EXTRA_CFLAGS"
-    fi    
-    if test "x$ac_cv_func_poll" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_POLL $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_func_epoll_create" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_EPOLL $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_func_getifaddrs" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETIFADDRS $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_func_getopt" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GETOPT $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_func_pselect" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_PSELECT $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_header_alloca_h" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_ALLOCA_H $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_c_compiler_gnu" = "xno"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_ISO_VARARGS $LIBZMQ_EXTRA_CFLAGS"
-    else
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_GNU_VARARGS $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    if test "x$ac_cv_func_vasprintf" = "xyes"; then
-        LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_VASPRINTF $LIBZMQ_EXTRA_CFLAGS"
-    fi
-    case "${host_cpu}" in
-        i*86|x86_64|amd64|*sparc*)
-            LIBZMQ_EXTRA_CFLAGS="-DCONFIG_HAVE_TSC -DCONFIG_HAVE_RTC -DCONFIG_HAVE_HPET $LIBZMQ_EXTRA_CFLAGS"
-        ;;
-        *sparc*|s390*)
-        ;;
-    esac
-fi
-
 # Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
 AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
 AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
@@ -394,6 +351,7 @@ AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
     perf/Makefile src/libzmq.pc \
-    builds/msvc/Makefile tests/Makefile])
+    builds/msvc/Makefile tests/Makefile \
+    foreign/openpgm/Makefile])
 AC_OUTPUT
 
-- 
cgit v1.2.3