Imported Upstream version 2.1.4upstream/2.1.4

1 files changed, 40 insertions, 92 deletions

diff --git a/configure b/configure
index 8a02da6..9bfd5f4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for zeromq 2.1.3.
+# Generated by GNU Autoconf 2.67 for zeromq 2.1.4.
 #
 # Report bugs to <zeromq-dev@lists.zeromq.org>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='zeromq'
 PACKAGE_TARNAME='zeromq'
-PACKAGE_VERSION='2.1.3'
-PACKAGE_STRING='zeromq 2.1.3'
+PACKAGE_VERSION='2.1.4'
+PACKAGE_STRING='zeromq 2.1.4'
 PACKAGE_BUGREPORT='zeromq-dev@lists.zeromq.org'
 PACKAGE_URL=''
 
@@ -754,9 +754,10 @@ ON_MINGW_FALSE
 ON_MINGW_TRUE
 BUILD_PGM_FALSE
 BUILD_PGM_TRUE
+pgm_basename
 subdirs
 pgm_srcdir
-pgm_basename
+pgm_subdir
 INSTALL_MAN_FALSE
 INSTALL_MAN_TRUE
 BUILD_DOC_FALSE
@@ -1454,7 +1455,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures zeromq 2.1.3 to adapt to many kinds of systems.
+\`configure' configures zeromq 2.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1525,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of zeromq 2.1.3:";;
+     short | recursive ) echo "Configuration of zeromq 2.1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1634,7 +1635,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-zeromq configure 2.1.3
+zeromq configure 2.1.4
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2389,7 +2390,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by zeromq $as_me 2.1.3, which was
+It was created by zeromq $as_me 2.1.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3208,7 +3209,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='zeromq'
- VERSION='2.1.3'
+ VERSION='2.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6283,13 +6284,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6286: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6287: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6289: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6290: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6292: output\"" >&5)
+  (eval echo "\"\$as_me:6293: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7492,7 +7493,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7495 "configure"' > conftest.$ac_ext
+  echo '#line 7496 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9516,11 +9517,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9519: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9520: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9523: \$? = $ac_status" >&5
+   echo "$as_me:9524: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9855,11 +9856,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9858: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9859: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9862: \$? = $ac_status" >&5
+   echo "$as_me:9863: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9960,11 +9961,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9963: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9964: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9967: \$? = $ac_status" >&5
+   echo "$as_me:9968: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10015,11 +10016,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10018: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10019: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10022: \$? = $ac_status" >&5
+   echo "$as_me:10023: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12399,7 +12400,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12402 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12495,7 +12496,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12498 "configure"
+#line 12499 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14451,11 +14452,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14455: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14458: \$? = $ac_status" >&5
+   echo "$as_me:14459: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14550,11 +14551,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14553: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14554: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14557: \$? = $ac_status" >&5
+   echo "$as_me:14558: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14602,11 +14603,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14605: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14606: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14609: \$? = $ac_status" >&5
+   echo "$as_me:14610: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18256,9 +18257,7 @@ fi
 #  PGM extension
 ac_zmq_pgm_ext="no"
 
-pgm_basename="libpgm-5.1.114~dfsg"
-
-
+pgm_basename="libpgm-5.1.115~dfsg"
 
 
 # Check whether --with-pgm was given.
@@ -18300,6 +18299,9 @@ $as_echo "$as_me: Unpacking ${pgm_basename}.tar.gz" >&6;}
         mkdir foreign/openpgm/build-staging/openpgm/pgm/config
     fi
 
+    pgm_subdir=build-staging/openpgm/pgm
+
+
 
 
 
@@ -18313,6 +18315,8 @@ $as_echo "#define ZMQ_HAVE_OPENPGM 1" >>confdefs.h
     ac_zmq_pgm_ext="yes"
 fi
 
+
+
 # Set -Wall, -Werror and -pedantic
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -18544,69 +18548,12 @@ fi
 done
 
 
-if test "x$with_pgm_ext" != "xno"; then
-
-    # Check additional functions for PGM build
-    for ac_func in poll epoll_create pselect getopt vasprintf getprotobyname_r2 getprotobyname_r
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-    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_config_files="$ac_config_files Makefile src/Makefile doc/Makefile perf/Makefile src/libzmq.pc builds/msvc/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile perf/Makefile src/libzmq.pc builds/msvc/Makefile tests/Makefile foreign/openpgm/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19154,7 +19101,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by zeromq $as_me 2.1.3, which was
+This file was extended by zeromq $as_me 2.1.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19220,7 +19167,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-zeromq config.status 2.1.3
+zeromq config.status 2.1.4
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -19711,6 +19658,7 @@ do
     "src/libzmq.pc") CONFIG_FILES="$CONFIG_FILES src/libzmq.pc" ;;
     "builds/msvc/Makefile") CONFIG_FILES="$CONFIG_FILES builds/msvc/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "foreign/openpgm/Makefile") CONFIG_FILES="$CONFIG_FILES foreign/openpgm/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac