Remove configure argument --disable-libevent.
Add configure args --with-libevent-header|lib.
* FIX: handling of '/' and ':' in volume name
* UPD: Install relevant includes necessary for building programs with
installed headers and shared lib libatalk
* FIX: handling of '/' and ':' in volume name
* UPD: Install relevant includes necessary for building programs with
installed headers and shared lib libatalk
+* UPD: libevent configure args to pick up installed version. Removed
+ configure arg --disable-libevent, added configure args
+ --with-libevent-header|lib.
* REM: Remove --with-smbsharemodes configure option, it was an
empty stub not yet implemented
* REM: Remove --with-smbsharemodes configure option, it was an
empty stub not yet implemented
netatalk_LDADD = \
$(top_builddir)/libatalk/libatalk.la
netatalk_LDADD = \
$(top_builddir)/libatalk/libatalk.la
if USE_BUILTIN_LIBEVENT
netatalk_CFLAGS += \
-I$(top_srcdir)/libevent/include \
if USE_BUILTIN_LIBEVENT
netatalk_CFLAGS += \
-I$(top_srcdir)/libevent/include \
netatalk_LDADD += \
$(top_builddir)/libevent/libevent.la
netatalk_LDADD += \
$(top_builddir)/libevent/libevent.la
-endif
\ No newline at end of file
+else
+netatalk_CFLAGS += @LIBEVENT_CFLAGS@
+netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent
+endif
dnl Whether to disable bundled libevent
AC_DEFUN([AC_NETATALK_LIBEVENT], [
dnl Whether to disable bundled libevent
AC_DEFUN([AC_NETATALK_LIBEVENT], [
- AC_MSG_CHECKING([whether to disable bundled libevent (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)])
- AC_ARG_ENABLE(
- bundled-libevent,
- [AS_HELP_STRING([--disable-bundled-libevent],[whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)
- ])],
- use_bundled_libevent=$enableval,
+ use_bundled_libevent=no
+ AC_MSG_CHECKING([whether to use bundled or installed libevent])
+ AC_ARG_WITH(
+ libevent-header,
+ [AS_HELP_STRING([--with-libevent-header],[path to libevent header files])],
+ LIBEVENT_CFLAGS=-I$withval,
use_bundled_libevent=yes
)
use_bundled_libevent=yes
)
+ AC_ARG_WITH(
+ libevent-lib,
+ [AS_HELP_STRING([--with-libevent-lib],[path to libevent header library])],
+ LIBEVENT_LDFLAGS=-L$withval,
+ use_bundled_libevent=yes
+ )
+ AC_MSG_RESULT([$use_bundled_libevent])
if test x"$use_bundled_libevent" = x"yes" ; then
AC_CONFIG_SUBDIRS([libevent])
fi
if test x"$use_bundled_libevent" = x"yes" ; then
AC_CONFIG_SUBDIRS([libevent])
fi
+ AC_SUBST(LIBEVENT_CFLAGS)
+ AC_SUBST(LIBEVENT_LDFLAGS)
AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
])
AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
])