diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index bcf5128..f13edb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(LibVNCServer, 0.9.10, https://github.com/LibVNC/libvncserver) +AC_INIT(LibVNCServer, 0.9.11, https://github.com/LibVNC/libvncserver) AM_INIT_AUTOMAKE([subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_CONFIG_HEADER(rfbconfig.h) @@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4]) # set detailed version info AC_DEFINE(VERSION_MAJOR, 0, LibVNCServer major version) AC_DEFINE(VERSION_MINOR, 9, LibVNCServer minor version) -AC_DEFINE(VERSION_PATCHLEVEL, 10, LibVNCServer patchlevel) +AC_DEFINE(VERSION_PATCHLEVEL, 11, LibVNCServer patchlevel) # Checks for programs. AC_PROG_CC @@ -24,13 +24,13 @@ test "x$GCC" = "xyes" && CFLAGS="$CFLAGS -Wall" AC_PROG_MAKE_SET AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -AC_PATH_PROG([AR], [ar], [/usr/bin/ar], +AC_CHECK_TOOL([AR], [ar], [/usr/bin/ar], [$PATH:/usr/ccs/bin]) # Options AH_TEMPLATE(WITH_TIGHTVNC_FILETRANSFER, [Disable TightVNCFileTransfer protocol]) AC_ARG_WITH(tightvnc-filetransfer, - [ --without-filetransfer disable TightVNC file transfer protocol], + [ --without-tightvnc-filetransfer disable TightVNC file transfer protocol], , [ with_tightvnc_filetransfer=yes ]) # AC_DEFINE moved to after libpthread check. @@ -68,6 +68,9 @@ if test ! -z "$with_ffmpeg"; then fi AM_CONDITIONAL(HAVE_MP3LAME, test "$HAVE_MP3LAME" = "true") +PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd], [with_systemd=1], [with_systemd=0]) +AM_CONDITIONAL([WITH_SYSTEMD], [test $with_systemd -eq 1]) + # Seem to need this dummy here to induce the 'checking for egrep... grep -E', etc. # before it seemed to be inside the with_jpeg conditional. AC_CHECK_HEADER(thenonexistentheader.h, HAVE_THENONEXISTENTHEADER_H="true") @@ -149,18 +152,6 @@ AC_SUBST(SSL_LIBS) AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS") -# See if we want libva support -AH_TEMPLATE(CONFIG_LIBVA, [Build libva support]) -AC_ARG_WITH(libva, -[ --without-libva disable support for libva],,) -if test "x$with_libva" != "xno"; then - AC_CHECK_LIB(va-x11, vaGetDisplay, - VA_LIBS="-lva -lva-x11" - [AC_DEFINE(CONFIG_LIBVA) CONFIG_LIBVA="true"], ,) -fi -AC_SUBST(VA_LIBS) -AM_CONDITIONAL(CONFIG_LIBVA, test ! -z "$VA_LIBS") - AC_ARG_WITH(jpeg, @@ -510,21 +501,15 @@ fi # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([arpa/inet.h endian.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/endian.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h ws2tcpip.h]) +AC_CHECK_HEADERS([arpa/inet.h endian.h fcntl.h netdb.h netinet/in.h stdlib.h stdint.h string.h sys/endian.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h ws2tcpip.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE -AC_C_BIGENDIAN AC_TYPE_SIZE_T AC_HEADER_TIME AC_HEADER_SYS_WAIT AX_TYPE_SOCKLEN_T -if test ! -d ./rfb; then - echo "creating subdir ./rfb for rfbint.h" - mkdir ./rfb -fi -AX_CREATE_STDINT_H(rfb/rfbint.h) AC_CACHE_CHECK([for in_addr_t], vnc_cv_inaddrt, [ AC_TRY_COMPILE([#include <sys/types.h> |