generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-07 09:48:07 +01:00
Code Issues Projects Releases Wiki Activity

Run autoupdate on the configure.in

Browse Source 
I ran autoupdate on the configure.in, which generated most of the
patch attached. There is also a small manual fix in which removes the
warning "Remember to add LT_INIT to configure.in" which I assume is
because AC_PROG_LIBTOOL was called inside a macro.

Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
This commit is contained in:
Mikko Koppanen 2010-11-18 11:51:27 +01:00 committed by Martin Sustrik
parent 72a7b93f12
commit 945c931daf
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acinclude.m4
View File

@ -19,9 +19,6 @@ AC_DEFUN([AC_CONFIG_LIBTOOL], [{
AC_ENABLE_STATIC AC_ENABLE_STATIC
;; ;;
esac esac
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
}]) }])

13
configure.in
View File

@ -6,9 +6,7 @@ AC_PREREQ(2.61)
# the version.sh script. Hence, it should be updated there. # the version.sh script. Hence, it should be updated there.
# The version in git should reflect the *next* version planned. # The version in git should reflect the *next* version planned.
# #
AC_INIT([zeromq], AC_INIT([zeromq],[m4_esyscmd(./version.sh | tr -d '\n')],[zeromq-dev@lists.zeromq.org])
m4_esyscmd([./version.sh | tr -d '\n']),
[zeromq-dev@lists.zeromq.org])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config) AC_CONFIG_MACRO_DIR(config)
@ -41,6 +39,8 @@ AC_CANONICAL_HOST
# Libtool configuration for different targets. See acinclude.m4 # Libtool configuration for different targets. See acinclude.m4
AC_CONFIG_LIBTOOL AC_CONFIG_LIBTOOL
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
# Check for ICC and Sun Studio compilers # Check for ICC and Sun Studio compilers
AC_LANG(C) AC_LANG(C)
@ -277,7 +277,7 @@ AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
if test "x$with_pgm_ext" != "xno"; then if test "x$with_pgm_ext" != "xno"; then
if test "x$ac_cv_prog_cc_c99" = "xno"; then if test "x$ac_cv_prog_cc_c99" = "xno"; then
AC_WARN([The C compiler is not set to C99 mode. The build will most likely fail]) AC_MSG_WARN([The C compiler is not set to C99 mode. The build will most likely fail])
fi fi
AC_MSG_CHECKING([if the PGM extension is supported on this platform]) AC_MSG_CHECKING([if the PGM extension is supported on this platform])
@ -359,9 +359,10 @@ AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs) AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
AC_OUTPUT(Makefile src/Makefile doc/Makefile AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
perf/Makefile src/libzmq.pc \ perf/Makefile src/libzmq.pc \
devices/Makefile devices/zmq_forwarder/Makefile \ devices/Makefile devices/zmq_forwarder/Makefile \
devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \ devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \
builds/msvc/Makefile tests/Makefile) builds/msvc/Makefile tests/Makefile])
AC_OUTPUT