Deleted Added
full compact
ntp_libevent.m4 (280849) ntp_libevent.m4 (289764)
1# SYNOPSIS -*- Autoconf -*-
2#
3# NTP_ENABLE_LOCAL_LIBEVENT
4# NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
5# NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
6#
7# DESCRIPTION
8#

--- 50 unchanged lines hidden (view full) ---

59dnl
60AC_DEFUN([NTP_LIBEVENT_CHECK_NOBUILD], [
61AC_REQUIRE([NTP_PKG_CONFIG])dnl
62AC_REQUIRE([NTP_ENABLE_LOCAL_LIBEVENT])dnl
63
64ntp_libevent_min_version=m4_default([$1], [2.0.9])
65ntp_libevent_tearoff=m4_default([$2], [libevent])
66
1# SYNOPSIS -*- Autoconf -*-
2#
3# NTP_ENABLE_LOCAL_LIBEVENT
4# NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
5# NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
6#
7# DESCRIPTION
8#

--- 50 unchanged lines hidden (view full) ---

59dnl
60AC_DEFUN([NTP_LIBEVENT_CHECK_NOBUILD], [
61AC_REQUIRE([NTP_PKG_CONFIG])dnl
62AC_REQUIRE([NTP_ENABLE_LOCAL_LIBEVENT])dnl
63
64ntp_libevent_min_version=m4_default([$1], [2.0.9])
65ntp_libevent_tearoff=m4_default([$2], [libevent])
66
67AC_SUBST([CFLAGS_LIBEVENT])
67AC_SUBST([CPPFLAGS_LIBEVENT])
68AC_SUBST([LDADD_LIBEVENT])
69
70case "$ntp_use_local_libevent" in
71 yes)
72 ;;
73 *) # If we have (a good enough) pkg-config, see if it can find libevent
74 case "$PKG_CONFIG" in
75 /*)
76 AC_MSG_CHECKING([if libevent $ntp_libevent_min_version or later is installed])
77 if $PKG_CONFIG --atleast-version=$ntp_libevent_min_version libevent
78 then
79 ntp_use_local_libevent=no
80 AC_MSG_NOTICE([Using the installed libevent])
68AC_SUBST([CPPFLAGS_LIBEVENT])
69AC_SUBST([LDADD_LIBEVENT])
70
71case "$ntp_use_local_libevent" in
72 yes)
73 ;;
74 *) # If we have (a good enough) pkg-config, see if it can find libevent
75 case "$PKG_CONFIG" in
76 /*)
77 AC_MSG_CHECKING([if libevent $ntp_libevent_min_version or later is installed])
78 if $PKG_CONFIG --atleast-version=$ntp_libevent_min_version libevent
79 then
80 ntp_use_local_libevent=no
81 AC_MSG_NOTICE([Using the installed libevent])
82 CFLAGS_LIBEVENT=`$PKG_CONFIG --cflags libevent_pthreads`
81 CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent`
82 # HMS: I hope the following is accurate.
83 # We don't need -levent, we only need -levent_core.
84 # While we could grab only the -L stuff, there *might* be
85 # other flags there we want. Originally we just removed -levent
86 # but then somebody decided to install -levent-2.0
87 # LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'`
88 # So now we dance...

--- 12 unchanged lines hidden (view full) ---

101 case "$LIBISC_PTHREADS_NOTHREADS" in
102 pthreads)
103 LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads"
104 esac
105 LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_core"
106 AC_MSG_RESULT([yes])
107 else
108 ntp_use_local_libevent=yes
83 CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent`
84 # HMS: I hope the following is accurate.
85 # We don't need -levent, we only need -levent_core.
86 # While we could grab only the -L stuff, there *might* be
87 # other flags there we want. Originally we just removed -levent
88 # but then somebody decided to install -levent-2.0
89 # LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'`
90 # So now we dance...

--- 12 unchanged lines hidden (view full) ---

103 case "$LIBISC_PTHREADS_NOTHREADS" in
104 pthreads)
105 LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads"
106 esac
107 LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_core"
108 AC_MSG_RESULT([yes])
109 else
110 ntp_use_local_libevent=yes
111 # HMS: do we only need to do this if LIBISC_PTHREADS_NOTHREADS
112 # is "pthreads"?
113 CFLAGS_LIBEVENT=`$PKG_CONFIG --cflags libevent_pthreads`
109 AC_MSG_RESULT([no])
110 fi
111 ;;
112 *)
113 ntp_use_local_libevent=yes
114 ;;
115 esac
116 ;;

--- 7 unchanged lines hidden (view full) ---

124 pthreads)
125 LDADD_LIBEVENT="\$(top_builddir)/$ntp_libevent_tearoff/libevent_pthreads.la \$(top_builddir)/$ntp_libevent_tearoff/libevent_core.la"
126 ;;
127 *)
128 LDADD_LIBEVENT="\$(top_builddir)/$ntp_libevent_tearoff/libevent_core.la"
129 esac
130esac
131
114 AC_MSG_RESULT([no])
115 fi
116 ;;
117 *)
118 ntp_use_local_libevent=yes
119 ;;
120 esac
121 ;;

--- 7 unchanged lines hidden (view full) ---

129 pthreads)
130 LDADD_LIBEVENT="\$(top_builddir)/$ntp_libevent_tearoff/libevent_pthreads.la \$(top_builddir)/$ntp_libevent_tearoff/libevent_core.la"
131 ;;
132 *)
133 LDADD_LIBEVENT="\$(top_builddir)/$ntp_libevent_tearoff/libevent_core.la"
134 esac
135esac
136
137dnl AC_ARG_ENABLE(
138dnl [cflags-libevent],
139dnl [AC_HELP_STRING(
140dnl [--enable-cflags-libevent=-pthread],
141dnl [CFLAGS value to build with pthreads]
142dnl )],
143dnl [CFLAGS_LIBEVENT=$enableval],
144dnl [# See above about LIBISC_PTHREADS_NOTHREADS
145dnl case "$CFLAGS_LIBEVENT" in
146dnl '') CFLAGS_LIBEVENT="-pthread" ;;
147dnl *) ;;
148dnl esac]
149dnl )
150dnl AC_MSG_NOTICE([LIBISC_PTHREADS_NOTHREADS is <$LIBISC_PTHREADS_NOTHREADS>])
151dnl AC_MSG_NOTICE([CFLAGS_LIBEVENT is <$CFLAGS_LIBEVENT>])
152
132AM_CONDITIONAL([BUILD_LIBEVENT], [test "x$ntp_use_local_libevent" = "xyes"])
133
134]) dnl NTP_LIBEVENT_CHECK_NOBUILD
135
136dnl NTP_LIBEVENT_CHECK([MINVERSION [, DIR]]) -*- Autoconf -*-
137AC_DEFUN([NTP_LIBEVENT_CHECK], [
138
139AC_SUBST([NTP_FORCE_LIBEVENT_DIST])

--- 32 unchanged lines hidden ---
153AM_CONDITIONAL([BUILD_LIBEVENT], [test "x$ntp_use_local_libevent" = "xyes"])
154
155]) dnl NTP_LIBEVENT_CHECK_NOBUILD
156
157dnl NTP_LIBEVENT_CHECK([MINVERSION [, DIR]]) -*- Autoconf -*-
158AC_DEFUN([NTP_LIBEVENT_CHECK], [
159
160AC_SUBST([NTP_FORCE_LIBEVENT_DIST])

--- 32 unchanged lines hidden ---