diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index a1fc3b7..7a70be9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- Autoconf -*- | 1 | # -*- Autoconf -*- |
2 | # Process this file with autoconf to produce a configure script. | 2 | # Process this file with autoconf to produce a configure script. |
3 | 3 | ||
4 | AC_PREREQ(2.64) | 4 | AC_PREREQ(2.68) |
5 | AC_INIT([usbmuxd], [1.1.2], [https://github.com/libimobiledevice/usbmuxd/issues],, [https://libimobiledevice.org]) | 5 | AC_INIT([usbmuxd], [1.1.2], [https://github.com/libimobiledevice/usbmuxd/issues],, [https://libimobiledevice.org]) |
6 | AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news]) | 6 | AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news]) |
7 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) | 7 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) |
@@ -11,9 +11,8 @@ AC_CONFIG_MACRO_DIR([m4]) | |||
11 | 11 | ||
12 | # Checks for programs. | 12 | # Checks for programs. |
13 | AC_PROG_CC | 13 | AC_PROG_CC |
14 | AC_PROG_CXX | ||
15 | AM_PROG_CC_C_O | 14 | AM_PROG_CC_C_O |
16 | AC_PROG_LIBTOOL | 15 | LT_INIT |
17 | 16 | ||
18 | # Checks for libraries. | 17 | # Checks for libraries. |
19 | PKG_CHECK_MODULES(libusb, libusb-1.0 >= 1.0.9) | 18 | PKG_CHECK_MODULES(libusb, libusb-1.0 >= 1.0.9) |
@@ -38,11 +37,11 @@ if test "x$have_limd" = "xyes"; then | |||
38 | CACHED_CFLAGS="$CFLAGS" | 37 | CACHED_CFLAGS="$CFLAGS" |
39 | CFLAGS+=" $libimobiledevice_CFLAGS" | 38 | CFLAGS+=" $libimobiledevice_CFLAGS" |
40 | AC_CACHE_CHECK(for enum idevice_connection_type, ac_cv_enum_idevice_connection_type, | 39 | AC_CACHE_CHECK(for enum idevice_connection_type, ac_cv_enum_idevice_connection_type, |
41 | AC_TRY_COMPILE([ | 40 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ |
42 | #include <libimobiledevice/libimobiledevice.h> | 41 | #include <libimobiledevice/libimobiledevice.h> |
43 | ], [ | 42 | ], [ |
44 | enum idevice_connection_type conn_type = CONNECTION_USBMUXD; | 43 | enum idevice_connection_type conn_type = CONNECTION_USBMUXD; |
45 | ], ac_cv_enum_idevice_connection_type=yes, ac_cv_enum_idevice_connection_type=no)) | 44 | ])], ac_cv_enum_idevice_connection_type=yes, ac_cv_enum_idevice_connection_type=no)) |
46 | CFLAGS="$CACHED_CFLAGS" | 45 | CFLAGS="$CACHED_CFLAGS" |
47 | if (test "$ac_cv_enum_idevice_connection_type" = "yes"); then | 46 | if (test "$ac_cv_enum_idevice_connection_type" = "yes"); then |
48 | AC_DEFINE(HAVE_ENUM_IDEVICE_CONNECTION_TYPE, 1, [Define if enum idevice_connection_type is available]) | 47 | AC_DEFINE(HAVE_ENUM_IDEVICE_CONNECTION_TYPE, 1, [Define if enum idevice_connection_type is available]) |
@@ -93,7 +92,6 @@ fi | |||
93 | AC_SUBST(udev_activation_rule) | 92 | AC_SUBST(udev_activation_rule) |
94 | 93 | ||
95 | # Checks for header files. | 94 | # Checks for header files. |
96 | AC_HEADER_STDC | ||
97 | AC_CHECK_HEADERS([stdint.h stdlib.h string.h]) | 95 | AC_CHECK_HEADERS([stdint.h stdlib.h string.h]) |
98 | 96 | ||
99 | # Checks for typedefs, structures, and compiler characteristics. | 97 | # Checks for typedefs, structures, and compiler characteristics. |
@@ -155,13 +153,14 @@ AC_SUBST(GLOBAL_CFLAGS) | |||
155 | 153 | ||
156 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) | 154 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) |
157 | 155 | ||
158 | AC_OUTPUT([ | 156 | AC_CONFIG_FILES([ |
159 | Makefile | 157 | Makefile |
160 | src/Makefile | 158 | src/Makefile |
161 | udev/Makefile | 159 | udev/Makefile |
162 | systemd/Makefile | 160 | systemd/Makefile |
163 | docs/Makefile | 161 | docs/Makefile |
164 | ]) | 162 | ]) |
163 | AC_OUTPUT | ||
165 | 164 | ||
166 | echo " | 165 | echo " |
167 | Configuration for $PACKAGE $VERSION: | 166 | Configuration for $PACKAGE $VERSION: |