Changeset 10675 for trunk/configure.ac


Ignore:
Timestamp:
May 20, 2010, 8:16:22 PM (12 years ago)
Author:
charles
Message:

(trunk) #3222 "don't bundle libevent" -- autoconf-based builds no longer use our copy of libevent, and it's not included in the tarball anymore.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r10638 r10675  
    203203             [libevent_extra_libs=""])
    204204
    205 dnl build our copy of libevent whether we use it or not,
    206 dnl because "make dist" needs its Makefiles to exist, and
    207 dnl AM_CONDITIONAL + AC_CONFIG_SUBDIRS don't seem to play nice
    208 AC_CONFIG_SUBDIRS([third-party/libevent])
    209 libevent_source=bundled
     205dnl libevent
    210206AC_CHECK_LIB([event],[evutil_vsnprintf],
    211              [libevent_found=yes],
    212              [libevent_found=no],
     207             [],
     208             [AC_MSG_ERROR(libevent not found!)],
    213209             [$libevent_extra_libs])
    214 AC_CHECK_HEADER([event-config.h],
    215                 [libevent_headers_found=yes],
    216                 [libevent_headers_found=no])
    217 libevent_source=bundled
    218 if test "x$libevent_found" = "xyes" ; then
    219     if test "x$libevent_headers_found" = "xyes"; then
    220         libevent_source=system
    221     fi
    222 fi
    223 if test "x$libevent_source" = "xbundled"; then
    224     AC_MSG_WARN([using our own libevent from third-party/libevent/])
    225     AC_MSG_WARN([if you are cross-compiling this is probably NOT what you want.])
    226     LIBEVENT_CFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
    227     LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/libevent.la"
    228 else
    229     LIBEVENT_CFLAGS=""
    230     LIBEVENT_LIBS="-levent $libevent_extra_libs"
    231 fi
     210AC_CHECK_HEADER([event-config.h],[],
     211                [AC_MSG_ERROR(event-config.h not found!)])
     212LIBEVENT_CFLAGS=""
     213LIBEVENT_LIBS="-levent $libevent_extra_libs"
    232214AC_ARG_VAR([LIBEVENT_CFLAGS], [C compiler flags for LIBEVENT, overriding pkg-config])dnl
    233215AC_ARG_VAR([LIBEVENT_LIBS], [linker flags for LIBEVENT, overriding pkg-config])dnl
     
    514496   Source code location:                              ${srcdir}
    515497   Compiler:                                          ${CXX}
    516    System or bundled libevent:                        ${libevent_source}
    517498
    518499   Build Command-Line client:                         ${build_cli}
Note: See TracChangeset for help on using the changeset viewer.