X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=03bb9fbb89f1eeac89644cde9d9e1e2237fc55c2;hb=21b29ae70b3ca3c0729bd04880010dcb7e17e4fd;hp=94211dc0c88f4bb4948e0f166af7b93cf06cdb5f;hpb=10409fdd1143e43ac2a15777672d2e36655e4bff;p=platform%2Fupstream%2Fconnman.git diff --git a/configure.ac b/configure.ac index 94211dc..03bb9fb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(connman, 0.62) +AC_INIT(connman, 0.65) AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_CONFIG_HEADER(config.h) @@ -95,23 +95,6 @@ AC_ARG_ENABLE(ofono, AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no") AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin") -AC_ARG_WITH(dhclient, AC_HELP_STRING([--with-dhclient=PROGRAM], - [specify location of dhclient binary]), [path_dhclient=${withval}]) - -AC_ARG_ENABLE(dhclient, - AC_HELP_STRING([--enable-dhclient], [enable dhclient support]), - [enable_dhclient=${enableval}], [enable_dhclient="no"]) -if (test "${enable_dhclient}" != "no"); then - if (test -z "${path_dhclient}"); then - AC_PATH_PROG(DHCLIENT, [dhclient], [], $PATH:/sbin:/usr/sbin) - else - DHCLIENT="${path_dhclient}" - AC_SUBST(DHCLIENT) - fi -fi -AM_CONDITIONAL(DHCLIENT, test "${enable_dhclient}" != "no") -AM_CONDITIONAL(DHCLIENT_BUILTIN, test "${enable_dhclient}" = "builtin") - AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM], [specify location of openconnect binary]), [path_openconnect=${withval}]) @@ -286,14 +269,14 @@ AC_ARG_WITH(stats-max-file-size, AC_HELP_STRING([--with-stats-max-file-size=SIZE [stats_max_file_size=${withval}]) if (test -z "${stats_max_file_size}"); then - # default size is 512 kByte - stats_max_file_size="512 * 8 * 128" + # default size is 16 kByte + stats_max_file_size="16 * 8 * 128" fi AC_DEFINE_UNQUOTED([STATS_MAX_FILE_SIZE], (${stats_max_file_size}), [Maximal size of a statistics round robin file]) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes, - AC_MSG_ERROR(GLib >= 2.16 is required)) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22, dummy=yes, + AC_MSG_ERROR(GLib >= 2.22 is required)) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -345,7 +328,7 @@ if (test "${enable_systemd}" = "yes"); then PKG_CHECK_MODULES(SYSTEMD, systemd, dummy=yes, AC_MSG_ERROR(systemd is required)) SYSTEMD_UNITDIR="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`" - if (test -z "${SYSTEM_UNITDIR}"); then + if (test -z "${SYSTEMD_UNITDIR}"); then SYSTEMD_UNITDIR="/lib/systemd/system" fi AC_SUBST(SYSTEMD_UNITDIR)