From 4a7aad06d95701cf232198093ce396dcdbb53e5b Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 16 Feb 2012 10:01:47 +0900 Subject: ZeroMQ renamed to Crossroads Signed-off-by: Martin Sustrik --- configure.in | 164 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 78 insertions(+), 86 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0c8cc2f..382329f 100644 --- a/configure.in +++ b/configure.in @@ -2,11 +2,11 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) # -# The 0MQ version number is extracted from include/zmq.h using +# The Crossroads version number is extracted from include/xs.h using # the version.sh script. Hence, it should be updated there. # The version in git should reflect the *next* version planned. # -AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[zeromq-dev@lists.zeromq.org]) +AC_INIT([libxs],[m4_esyscmd([./version.sh])]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config) @@ -23,21 +23,14 @@ AC_SUBST(PACKAGE_VERSION) # understand: # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # -# Changes: -# -# ZeroMQ versions prior to 2.1.0 use 0:0:0 (undefined) -# ZeroMQ versions 2.1.x: 1:0:0 (ABI version 1) -# ZeroMQ version 3.0: 2:0:0 (ABI version 2) -# ZeroMQ version 3.1: 3:0:0 (ABI version 3) -# -# libzmq -version-info current:revision:age -LTVER="3:0:0" +# libxs -version-info current:revision:age +LTVER="0:0:0" AC_SUBST(LTVER) # Take a copy of original flags -ZMQ_ORIG_CFLAGS="${CFLAGS:-none}" -ZMQ_ORIG_CPPFLAGS="${CPPFLAGS:-none}" -ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}" +XS_ORIG_CFLAGS="${CFLAGS:-none}" +XS_ORIG_CPPFLAGS="${CPPFLAGS:-none}" +XS_ORIG_CXXFLAGS="${CXXFLAGS:-none}" # Checks for programs. AC_PROG_CC @@ -52,33 +45,33 @@ AC_ARG_VAR([XMLTO], [Path to xmlto command]) AC_PATH_PROG([XMLTO], [xmlto]) AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) AC_PATH_PROG([ASCIIDOC], [asciidoc]) -LIBZMQ_CONFIG_LIBTOOL +LIBXS_CONFIG_LIBTOOL AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL # Check whether to build a with debug symbols -LIBZMQ_CHECK_ENABLE_DEBUG +LIBXS_CHECK_ENABLE_DEBUG # Check wheter to enable code coverage -LIBZMQ_WITH_GCOV +LIBXS_WITH_GCOV # Checks for libraries. AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([rt], [clock_gettime]) # Set pedantic -libzmq_pedantic="yes" +libxs_pedantic="yes" # By default compiling with -Werror except OSX. -libzmq_werror="yes" +libxs_werror="yes" # By default use DSO visibility -libzmq_dso_visibility="yes" +libxs_dso_visibility="yes" # Whether we are on mingw or not. -libzmq_on_mingw32="no" +libxs_on_mingw32="no" -# Set some default features required by 0MQ code. +# Set some default features required by Crossroads code. CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS" # For host type checks @@ -91,18 +84,18 @@ case "${host_os}" in if test "x$GXX" = "xyes"; then CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS" fi - AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS]) + AC_DEFINE(XS_HAVE_LINUX, 1, [Have Linux OS]) case "${host_os}" in *android*) - AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS]) + AC_DEFINE(XS_HAVE_ANDROID, 1, [Have Android OS]) ;; esac ;; *solaris*) # Define on Solaris to enable all library features CPPFLAGS="-D_PTHREADS $CPPFLAGS" - AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS]) + AC_DEFINE(XS_HAVE_SOLARIS, 1, [Have Solaris OS]) AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) AC_MSG_CHECKING([whether atomic operations can be used]) @@ -116,32 +109,32 @@ case "${host_os}" in AC_MSG_RESULT([$solaris_has_atomic]) # Solaris 8 does not have atomic operations exported to user space. if test "x$solaris_has_atomic" = "xno"; then - AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes]) + AC_DEFINE(XS_FORCE_MUTEXES, 1, [Force to use mutexes]) fi ;; *freebsd*) # Define on FreeBSD to enable all library features CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS" - AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS]) + AC_DEFINE(XS_HAVE_FREEBSD, 1, [Have FreeBSD OS]) ;; *darwin*) # Define on Darwin to enable all library features CPPFLAGS="-D_DARWIN_C_SOURCE $CPPFLAGS" - libzmq_pedantic="no" - libzmq_werror="no" - AC_DEFINE(ZMQ_HAVE_OSX, 1, [Have DarwinOSX OS]) + libxs_pedantic="no" + libxs_werror="no" + AC_DEFINE(XS_HAVE_OSX, 1, [Have DarwinOSX OS]) AC_LANG_PUSH([C++]) - LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Wno-uninitialized]) + LIBXS_CHECK_LANG_FLAG_PREPEND([-Wno-uninitialized]) AC_LANG_POP([C++]) ;; *netbsd*) # Define on NetBSD to enable all library features CPPFLAGS="-D_NETBSD_SOURCE $CPPFLAGS" - AC_DEFINE(ZMQ_HAVE_NETBSD, 1, [Have NetBSD OS]) + AC_DEFINE(XS_HAVE_NETBSD, 1, [Have NetBSD OS]) # NetBSD 5.0 and newer provides atomic operations but we can # only use these on systems where PR #42842 has been fixed so # we must try and link a test program using C++. - libzmq_netbsd_has_atomic=no + libxs_netbsd_has_atomic=no AC_MSG_CHECKING([whether atomic operations can be used]) AC_LANG_PUSH([C++]) AC_LINK_IFELSE([AC_LANG_PROGRAM( @@ -149,35 +142,35 @@ case "${host_os}" in [[uint32_t value; atomic_cas_32 (&value, 0, 0); return 0;]])], - [libzmq_netbsd_has_atomic=yes], - [libzmq_netbsd_has_atomic=no]) + [libxs_netbsd_has_atomic=yes], + [libxs_netbsd_has_atomic=no]) AC_LANG_POP([C++]) - AC_MSG_RESULT([$libzmq_netbsd_has_atomic]) - if test "x$libzmq_netbsd_has_atomic" = "xno"; then - AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes]) + AC_MSG_RESULT([$libxs_netbsd_has_atomic]) + if test "x$libxs_netbsd_has_atomic" = "xno"; then + AC_DEFINE(XS_FORCE_MUTEXES, 1, [Force to use mutexes]) fi ;; *openbsd*) # Define on OpenBSD to enable all library features CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS" - AC_DEFINE(ZMQ_HAVE_OPENBSD, 1, [Have OpenBSD OS]) + AC_DEFINE(XS_HAVE_OPENBSD, 1, [Have OpenBSD OS]) ;; *nto-qnx*) - libzmq_pedantic="no" - AC_DEFINE(ZMQ_HAVE_QNXNTO, 1, [Have QNX Neutrino OS]) + libxs_pedantic="no" + AC_DEFINE(XS_HAVE_QNXNTO, 1, [Have QNX Neutrino OS]) AC_CHECK_LIB(socket, socket) ;; *aix*) - AC_DEFINE(ZMQ_HAVE_AIX, 1, [Have AIX OS]) + AC_DEFINE(XS_HAVE_AIX, 1, [Have AIX OS]) ;; *hpux*) # Define on HP-UX to enable all library features CPPFLAGS="-D_POSIX_C_SOURCE=200112L $CPPFLAGS" - AC_DEFINE(ZMQ_HAVE_HPUX, 1, [Have HPUX OS]) + AC_DEFINE(XS_HAVE_HPUX, 1, [Have HPUX OS]) ;; *mingw32*) - AC_DEFINE(ZMQ_HAVE_WINDOWS, 1, [Have Windows OS]) - AC_DEFINE(ZMQ_HAVE_MINGW32, 1, [Have MinGW32]) + AC_DEFINE(XS_HAVE_WINDOWS, 1, [Have Windows OS]) + AC_DEFINE(XS_HAVE_MINGW32, 1, [Have MinGW32]) AC_CHECK_HEADERS(windows.h) AC_CHECK_LIB(ws2_32, main, , [AC_MSG_ERROR([cannot link with ws2_32.dll.])]) @@ -187,10 +180,10 @@ case "${host_os}" in [AC_MSG_ERROR([cannot link with iphlpapi.dll.])]) # mingw32 defines __int64_t as long long AC_LANG_PUSH([C++]) - LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Wno-long-long]) + LIBXS_CHECK_LANG_FLAG_PREPEND([-Wno-long-long]) AC_LANG_POP([C++]) - libzmq_on_mingw32="yes" - libzmq_dso_visibility="no" + libxs_on_mingw32="yes" + libxs_dso_visibility="no" if test "x$enable_static" = "xyes"; then AC_MSG_ERROR([Building static libraries is not supported under MinGW32]) @@ -199,7 +192,7 @@ case "${host_os}" in *cygwin*) # Define on Cygwin to enable all library features CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS" - AC_DEFINE(ZMQ_HAVE_CYGWIN, 1, [Have Cygwin]) + AC_DEFINE(XS_HAVE_CYGWIN, 1, [Have Cygwin]) if test "x$enable_static" = "xyes"; then AC_MSG_ERROR([Building static libraries is not supported under Cygwin]) fi @@ -212,9 +205,9 @@ esac # # Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec # -if test "x$libzmq_dso_visibility" = "xyes"; then +if test "x$libxs_dso_visibility" = "xyes"; then AC_LANG_PUSH([C++]) - LIBZMQ_CHECK_LANG_VISIBILITY([LIBZMQ_EXTRA_CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag ${LIBZMQ_EXTRA_CXXFLAGS}"]) + LIBXS_CHECK_LANG_VISIBILITY([LIBXS_EXTRA_CXXFLAGS="$libxs_cv_[]_AC_LANG_ABBREV[]_visibility_flag ${LIBXS_EXTRA_CXXFLAGS}"]) AC_LANG_POP([C++]) fi @@ -222,7 +215,7 @@ fi case "${host_cpu}" in *sparc*) AC_LANG_PUSH([C++]) - LIBZMQ_CHECK_LANG_FLAG_PREPEND([-mcpu=v9]) + LIBXS_CHECK_LANG_FLAG_PREPEND([-mcpu=v9]) AC_LANG_POP([C++]) ;; *) @@ -230,10 +223,10 @@ case "${host_cpu}" in esac # Check whether to build docs / install man pages -LIBZMQ_CHECK_DOC_BUILD +LIBXS_CHECK_DOC_BUILD # Check polling system -LIBZMQ_CHECK_POLLER([CPPFLAGS="${CPPFLAGS} -D${libzmq_cv_poller_flag}"], +LIBXS_CHECK_POLLER([CPPFLAGS="${CPPFLAGS} -D${libxs_cv_poller_flag}"], [AC_MSG_ERROR([Unable to continue without polling system])]) # Checks for header files. @@ -242,16 +235,15 @@ AC_CHECK_HEADERS(errno.h arpa/inet.h netinet/tcp.h netinet/in.h stddef.h \ stdlib.h string.h sys/socket.h sys/time.h time.h unistd.h limits.h) # Check if we have ifaddrs.h header file. -AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(ZMQ_HAVE_IFADDRS, 1, [Have ifaddrs.h header.])]) +AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(XS_HAVE_IFADDRS, 1, [Have ifaddrs.h header.])]) # Force not to use eventfd AC_ARG_ENABLE([eventfd], [AS_HELP_STRING([--disable-eventfd], [disable eventfd [default=no]])], - [zmq_disable_eventfd=yes], [zmq_disable_eventfd=no]) + [xs_disable_eventfd=yes], [xs_disable_eventfd=no]) -if test "x$zmq_disable_eventfd" != "xyes"; then +if test "x$xs_disable_eventfd" != "xyes"; then # Check if we have eventfd.h header file. - AC_CHECK_HEADERS(sys/eventfd.h, - [AC_DEFINE(ZMQ_HAVE_EVENTFD, 1, [Have eventfd extension.])]) + AC_CHECK_HEADERS(sys/eventfd.h, [AC_DEFINE(XS_HAVE_EVENTFD, 1, [Have eventfd extension.])]) fi # Use c++ in subsequent tests @@ -261,11 +253,11 @@ AC_HEADER_STDBOOL AC_C_CONST AC_C_INLINE # Checks for typedefs, structures, and compiler characteristics. -if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then +if test "x$libxs_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then dnl 279: controlling expression is constant dnl Fixes build with ICC 12.x - LIBZMQ_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SIZE_T]) - LIBZMQ_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SSIZE_T]) + LIBXS_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SIZE_T]) + LIBXS_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SSIZE_T]) else AC_TYPE_SIZE_T AC_TYPE_SSIZE_T @@ -275,17 +267,17 @@ AC_TYPE_UINT32_T AC_C_VOLATILE # PGM extension -libzmq_pgm_ext="no" +libxs_pgm_ext="no" pgm_basename="libpgm-5.1.118~dfsg" AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], - [build libzmq with PGM extension [default=no]])], + [build libxs with PGM extension [default=no]])], [with_pgm_ext=$withval], [with_pgm_ext=no]) # build using system pgm AC_ARG_WITH([system-pgm], [AS_HELP_STRING([--with-system-pgm], - [build libzmq with PGM extension. Requires pkg-config [default=no]])], + [build libxs with PGM extension. Requires pkg-config [default=no]])], [with_system_pgm_ext=yes], [with_system_pgm_ext=no]) if test "x$with_pgm_ext" != "xno" -a "x$with_system_pgm_ext" != "xno"; then @@ -302,14 +294,14 @@ if test "x$with_pgm_ext" != "xno"; then # Unpack libpgm AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.gz]) - libzmq_pwd=`pwd` + libxs_pwd=`pwd` cd foreign/openpgm if ! (gzip -dc "${pgm_basename}.tar.gz" || echo "failed") | ${am__untar}; then AC_MSG_ERROR([cannot unpack the foreign/openpgm/${pgm_basename}.tar.gz file]) fi - cd "${libzmq_pwd}" + cd "${libxs_pwd}" if test -d foreign/openpgm/build-staging; then rm -rf foreign/openpgm/build-staging @@ -324,7 +316,7 @@ if test "x$with_pgm_ext" != "xno"; then # DSO symbol visibility for openpgm AC_LANG_PUSH([C]) - LIBZMQ_CHECK_LANG_VISIBILITY([ac_configure_args="CFLAGS='$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag' ${ac_configure_args}"]) + LIBXS_CHECK_LANG_VISIBILITY([ac_configure_args="CFLAGS='$libxs_cv_[]_AC_LANG_ABBREV[]_visibility_flag' ${ac_configure_args}"]) AC_LANG_POP([C]) pgm_subdir=build-staging/openpgm/pgm @@ -334,16 +326,16 @@ if test "x$with_pgm_ext" != "xno"; then AC_CONFIG_SUBDIRS([foreign/openpgm/build-staging/openpgm/pgm/]) # Success! - AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) - libzmq_pgm_ext="yes" + AC_DEFINE(XS_HAVE_OPENPGM, 1, [Have OpenPGM extension]) + libxs_pgm_ext="yes" fi # Build with system openpgm if test "x$with_system_pgm_ext" != "xno"; then m4_ifdef([PKG_CHECK_MODULES], [ PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1]) - AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) - LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS" + AC_DEFINE(XS_HAVE_OPENPGM, 1, [Have OpenPGM extension]) + LIBXS_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBXS_EXTRA_CXXFLAGS" LIBS="$OpenPGM_LIBS $LIBS" ], [AC_MSG_ERROR([--with-system-pgm requires a working pkg-config installation])]) @@ -355,37 +347,37 @@ AC_SUBST(pgm_basename) AC_LANG_PUSH([C++]) # Check how to enable -Wall -LIBZMQ_LANG_WALL([CPPFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag $CPPFLAGS"]) +LIBXS_LANG_WALL([CPPFLAGS="$libxs_cv_[]_AC_LANG_ABBREV[]_wall_flag $CPPFLAGS"]) -if test "x$libzmq_werror" = "xyes" -a "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" != "xyes"; then - LIBZMQ_LANG_WERROR([CPPFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag $CPPFLAGS"]) +if test "x$libxs_werror" = "xyes" -a "x$libxs_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" != "xyes"; then + LIBXS_LANG_WERROR([CPPFLAGS="$libxs_cv_[]_AC_LANG_ABBREV[]_werror_flag $CPPFLAGS"]) fi -if test "x$libzmq_pedantic" = "xyes"; then - LIBZMQ_LANG_STRICT([CPPFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag $CPPFLAGS"]) +if test "x$libxs_pedantic" = "xyes"; then + LIBXS_LANG_STRICT([CPPFLAGS="$libxs_cv_[]_AC_LANG_ABBREV[]_strict_flag $CPPFLAGS"]) fi AC_LANG_POP([C++]) -AM_CONDITIONAL(BUILD_PGM, test "x$libzmq_pgm_ext" = "xyes") -AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw32" = "xyes") +AM_CONDITIONAL(BUILD_PGM, test "x$libxs_pgm_ext" = "xyes") +AM_CONDITIONAL(ON_MINGW, test "x$libxs_on_mingw32" = "xyes") # Checks for library functions. AC_TYPE_SIGNAL AC_CHECK_FUNCS(perror gettimeofday clock_gettime memset socket getifaddrs freeifaddrs) AC_CHECK_HEADERS([alloca.h]) -LIBZMQ_CHECK_SOCK_CLOEXEC([AC_DEFINE( - [ZMQ_HAVE_SOCK_CLOEXEC], +LIBXS_CHECK_SOCK_CLOEXEC([AC_DEFINE( + [XS_HAVE_SOCK_CLOEXEC], [1], [Whether SOCK_CLOEXEC is defined and functioning.]) ]) -# Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS -AC_SUBST(LIBZMQ_EXTRA_CFLAGS) -AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS) -AC_SUBST(LIBZMQ_EXTRA_LDFLAGS) +# Subst LIBXS_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS +AC_SUBST(LIBXS_EXTRA_CFLAGS) +AC_SUBST(LIBXS_EXTRA_CXXFLAGS) +AC_SUBST(LIBXS_EXTRA_LDFLAGS) AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile - perf/Makefile src/libzmq.pc \ + perf/Makefile src/libxs.pc \ builds/msvc/Makefile tests/Makefile \ foreign/openpgm/Makefile \ builds/redhat/zeromq.spec]) -- cgit v1.2.3