Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 525234 | Differences between
and this patch

Collapse All | Expand All

(-)stunnel-5.07.orig/configure.ac (-3 / +28 lines)
Lines 168-174 Link Here
168
# AC_HEADER_SYS_WAIT
168
# AC_HEADER_SYS_WAIT
169
AC_CHECK_HEADERS([malloc.h ucontext.h pthread.h poll.h tcpd.h stropts.h grp.h unistd.h util.h libutil.h pty.h])
169
AC_CHECK_HEADERS([malloc.h ucontext.h pthread.h poll.h tcpd.h stropts.h grp.h unistd.h util.h libutil.h pty.h])
170
AC_CHECK_HEADERS([sys/types.h sys/select.h sys/poll.h sys/socket.h sys/un.h sys/ioctl.h sys/filio.h sys/resource.h sys/uio.h sys/syscall.h])
170
AC_CHECK_HEADERS([sys/types.h sys/select.h sys/poll.h sys/socket.h sys/un.h sys/ioctl.h sys/filio.h sys/resource.h sys/uio.h sys/syscall.h])
171
AC_CHECK_HEADERS([systemd/sd-daemon.h])
172
AC_CHECK_MEMBERS([struct msghdr.msg_control],
171
AC_CHECK_MEMBERS([struct msghdr.msg_control],
173
    [AC_DEFINE([HAVE_MSGHDR_MSG_CONTROL], [1],
172
    [AC_DEFINE([HAVE_MSGHDR_MSG_CONTROL], [1],
174
    [Define to 1 if you have 'msghdr.msg_control' structure.])], [], [
173
    [Define to 1 if you have 'msghdr.msg_control' structure.])], [], [
Lines 193-200 Link Here
193
AC_SEARCH_LIBS([dlopen], [dl])
192
AC_SEARCH_LIBS([dlopen], [dl])
194
AC_SEARCH_LIBS([shl_load], [dld])
193
AC_SEARCH_LIBS([shl_load], [dld])
195
AC_SEARCH_LIBS([inflateEnd], [z])
194
AC_SEARCH_LIBS([inflateEnd], [z])
196
# the library name has changed to -lsystemd in systemd 209
197
AC_SEARCH_LIBS([sd_listen_fds], [systemd systemd-daemon])
198
195
199
# Add BeOS libraries
196
# Add BeOS libraries
200
if test "$host_os" = "beos"; then
197
if test "$host_os" = "beos"; then
Lines 418-423 Link Here
418
    ]
415
    ]
419
)
416
)
420
417
418
# Systemd
419
AC_MSG_CHECKING([whether to enable systemd socket activation])
420
AC_ARG_ENABLE(systemd,
421
[  --enable-systemd        Enable systemd socket activation],
422
    [
423
        case "$enableval" in
424
            yes) AC_MSG_RESULT([yes])
425
                 AC_CHECK_HEADERS([systemd/sd-daemon.h])
426
                 # the library name has changed to -lsystemd in systemd 209
427
                 AC_SEARCH_LIBS([sd_listen_fds], [systemd systemd-daemon])
428
                 if test $ac_cv_search_sd_listen_fds = "no"; then
429
                     AC_MSG_ERROR([systemd socket activation requested but no systemd library found])
430
                 fi
431
                 ;;
432
            no)  AC_MSG_RESULT([no])
433
                 ;;
434
            *)   AC_MSG_RESULT([error])
435
                 AC_MSG_ERROR([bad value \"${enableval}\"])
436
                 ;;
437
        esac
438
    ],
439
    [
440
        # We revert to autodetection if no enable/disable flag was given
441
        AC_CHECK_HEADERS([systemd/sd-daemon.h])
442
        AC_SEARCH_LIBS([sd_listen_fds], [systemd systemd-daemon])
443
    ]
444
)
445
421
AC_MSG_NOTICE([**************************************** SSL])
446
AC_MSG_NOTICE([**************************************** SSL])
422
check_ssl_dir() { :
447
check_ssl_dir() { :
423
    SSLDIR="$1"
448
    SSLDIR="$1"

Return to bug 525234