Don't close the fd if libinput_add_fd() fails

[platform/upstream/libinput.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index af21866..bb702c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,16 @@
 AC_PREREQ([2.64])
 
 m4_define([libinput_major_version], [0])
-m4_define([libinput_minor_version], [0])
-m4_define([libinput_micro_version], [90])
+m4_define([libinput_minor_version], [5])
+m4_define([libinput_micro_version], [0])
 m4_define([libinput_version],
           [libinput_major_version.libinput_minor_version.libinput_micro_version])
 
 AC_INIT([libinput],
         [libinput_version],
-        [http://nobugtracker],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=libinput&version=libinput_version],
         [libinput],
-        [http://nohomepage])
+        [http://www.freedesktop.org/wiki/Software/libinput/])
 
 AC_SUBST([LIBINPUT_VERSION_MAJOR], [libinput_major_version])
 AC_SUBST([LIBINPUT_VERSION_MINOR], [libinput_minor_version])
@@ -20,12 +20,24 @@ AC_SUBST([LIBINPUT_VERSION], [libinput_version])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz subdir-objects])
+
+# Before making a release, the LIBINPUT_LT_VERSION string should be
+# modified.
+# The string is of the form C:R:A.
+# - If interfaces have been changed or added, but binary compatibility has
+#   been preserved, change to C+1:0:A+1
+# - If binary compatibility has been broken (eg removed or changed interfaces)
+#   change to C+1:0:0
+# - If the interface is the same as the previous version, change to C:R+1:A
+LIBINPUT_LT_VERSION=4:0:1
+AC_SUBST(LIBINPUT_LT_VERSION)
 
 AM_SILENT_RULES([yes])
 
 # Check for programs
-AC_PROG_CC
+AC_PROG_CC_C99
+AC_PROG_CXX # Only used by build C++ test
 
 # Initialize libtool
 LT_PREREQ([2.2])
@@ -44,11 +56,16 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
 PKG_PROG_PKG_CONFIG()
 PKG_CHECK_MODULES(MTDEV, [mtdev >= 1.1.0])
 PKG_CHECK_MODULES(LIBUDEV, [libudev])
+PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
+AC_CHECK_LIB([m], [atan2])
+AC_CHECK_LIB([rt], [clock_gettime])
 
 if test "x$GCC" = "xyes"; then
-       GCC_CFLAGS="-Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
+       GCC_CXXFLAGS="-Wall -Wextra -Wno-unused-parameter -g -fvisibility=hidden"
+       GCC_CFLAGS="$GCC_CXXFLAGS -Wmissing-prototypes -Wstrict-prototypes"
 fi
 AC_SUBST(GCC_CFLAGS)
+AC_SUBST(GCC_CXXFLAGS)
 
 AC_PATH_PROG(DOXYGEN, [doxygen])
 if test "x$DOXYGEN" = "x"; then
@@ -59,10 +76,57 @@ else
 fi
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$have_doxygen" = "xyes"])
 
+AC_ARG_ENABLE(event-gui,
+             AS_HELP_STRING([--enable-event-gui], [Build the GUI event viewer (default=auto)]),
+             [build_eventgui="$enableval"],
+             [build_eventgui="auto"])
+PKG_CHECK_EXISTS([cairo glib-2.0 gtk+-3.0], [HAVE_GUILIBS="yes"], [HAVE_GUILIBS="no"])
+
+if test "x$build_eventgui" = "xauto"; then
+       build_eventgui="$HAVE_GUILIBS"
+fi
+if test "x$build_eventgui" = "xyes"; then
+       PKG_CHECK_MODULES(CAIRO, [cairo])
+       PKG_CHECK_MODULES(GTK, [glib-2.0 gtk+-3.0])
+fi
+AM_CONDITIONAL(BUILD_EVENTGUI, [test "x$build_eventgui" = "xyes"])
+
+AC_ARG_ENABLE(tests,
+             AS_HELP_STRING([--enable-tests], [Build the tests (default=auto)]),
+             [build_tests="$enableval"],
+             [build_tests="auto"])
+
+PKG_CHECK_MODULES(CHECK, [check >= 0.9.9], [HAVE_CHECK="yes"], [HAVE_CHECK="no"])
+
+if test "x$build_tests" = "xauto"; then
+       build_tests="$HAVE_CHECK"
+fi
+if test "x$build_tests" = "xyes"; then
+       if test "x$HAVE_CHECK" = "xno"; then
+               AC_MSG_ERROR([Cannot build tests, check is missing])
+       fi
+
+       AC_PATH_PROG(VALGRIND, [valgrind])
+fi
+
+AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
+AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"])
+
 AC_CONFIG_FILES([Makefile
                 doc/Makefile
                 doc/libinput.doxygen
                 src/Makefile
                 src/libinput.pc
-                src/libinput-version.h])
+                src/libinput-version.h
+                test/Makefile
+                tools/Makefile])
 AC_OUTPUT
+
+AC_MSG_RESULT([
+       Prefix                  ${prefix}
+
+       Build documentation     ${have_doxygen}
+       Build tests             ${build_tests}
+       Tests use valgrind      ${VALGRIND}
+       Build GUI event tool    ${build_eventgui}
+       ])