Makefile: Fix typo in localstatedir

[network.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e612ff829fe45630635569796538c64e71691c47..7883ae9ee44bdf37066f744d9106f14b7dc4532f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ AC_INIT([network],
 
 AC_CONFIG_AUX_DIR([build-aux])
 
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AC_PREFIX_DEFAULT([/usr])
 
 AM_INIT_AUTOMAKE([
@@ -65,37 +67,21 @@ AC_PROG_CC_C99
 AC_PROG_CC_C_O
 AC_PROG_GCC_TRADITIONAL
 
-AC_USE_SYSTEM_EXTENSIONS
-
 CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
-       -pipe \
        -Wall \
-       -Wextra \
-       -Wno-inline \
-       -Wundef \
-       "-Wformat=2 -Wformat-security -Wformat-nonliteral" \
-       -Wno-unused-parameter \
-       -Wno-unused-result \
-       -fno-strict-aliasing \
-       -ffunction-sections \
-       -fdata-sections \
-       -fstack-protector-all \
-       --param=ssp-buffer-size=4])
-AC_SUBST([OUR_CFLAGS], $with_cflags)
-
-AS_CASE([$CFLAGS], [*-O[[12345g\ ]]*],
-       [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\
-               -Wp,-D_FORTIFY_SOURCE=2])],
-       [AC_MSG_RESULT([skipping -D_FORTIFY_SOURCE, optimization not enabled])])
-AC_SUBST([OUR_CPPFLAGS], $with_cppflags)
+       -Wchar-subscripts \
+       -Wformat-security \
+       -Wmissing-declarations \
+       -Wmissing-prototypes \
+       -Wnested-externs \
+       -Wpointer-arith \
+       -Wshadow \
+       -Wsign-compare \
+       -Wstrict-prototypes \
+       -Wtype-limits \
+])
 
-CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
-       -Wl,--as-needed \
-       -Wl,--no-undefined \
-       -Wl,--gc-sections \
-       -Wl,-z,relro \
-       -Wl,-z,now])
-AC_SUBST([OUR_LDFLAGS], $with_ldflags)
+AC_SUBST([OUR_CFLAGS], $with_cflags)
 
 # ------------------------------------------------------------------------------
 
@@ -147,17 +133,28 @@ AC_ARG_WITH(
 )
 AC_SUBST(dbuspolicydir)
 
-AC_ARG_WITH([dbussystembusdir], AS_HELP_STRING([--with-dbussystembusdir=DIR],
-               [path to D-Bus system bus services directory]), [with_dbussystembusdir=${withval}])
-if test -z "${with_dbussystembusdir}"; then
-       AC_MSG_CHECKING([D-Bus system bus services dir])
-       with_dbussystembusdir="$($PKG_CONFIG --variable=system_bus_services_dir dbus-1)"
-       if test -z "${with_dbussystembusdir}"; then
-               AC_MSG_ERROR([D-Bus system bus services directory is required])
-       fi
-       AC_MSG_RESULT([${with_dbussystembusdir}])
-fi
-AC_SUBST(dbussystembusdir, [${with_dbussystembusdir}])
+AC_ARG_WITH(
+       [dbussystembusdir],
+       AS_HELP_STRING(
+               [--with-dbussystembusdir=arg],
+               [path to D-Bus system bus services directory]
+       ),
+       [dbussystembusdir="$withval"],
+       [PKG_CHECK_VAR([dbussystembusdir], [dbus-1], [system_bus_services_dir],, [dbussystembusdir="${datarootdir}"])]
+)
+AC_SUBST(dbuspolicydir)
+
+AC_ARG_WITH(
+       [polkitpolicydir],
+       AS_HELP_STRING(
+               [--with-polkitpolicydir=arg],
+               [directory for PolicyKit policies]
+       ),
+       [polkitpolicydir="$withval"],
+       [PKG_CHECK_VAR([polkitpolicydir], [polkit], [actiondir])
+       polkitpolicydir="${datadir}/polkit-1/actions"]
+)
+AC_SUBST(polkitpolicydir)
 
 # ------------------------------------------------------------------------------
 AC_ARG_WITH([systemdsystemunitdir],
@@ -175,6 +172,8 @@ AM_CONDITIONAL(HAVE_UDEV, [test -n "$with_udevdir"])
 
 # ------------------------------------------------------------------------------
 
+PKG_CHECK_MODULES([CAP], [libcap])
+PKG_CHECK_MODULES([JSON_C], [json-c])
 PKG_CHECK_MODULES([LIBNL], [libnl-3.0 libnl-genl-3.0])
 PKG_CHECK_MODULES([SYSTEMD], [libsystemd])
 
@@ -202,7 +201,9 @@ AC_MSG_RESULT([
 
        prefix:               $prefix
 
+       dbuspolicydir:        ${dbuspolicydir}
        dbussystembusdir:     ${dbussystembusdir}
+       polkitpolicydir:      ${polkitpolicydir}
        systemdsystemunitdir: $systemdsystemunitdir
        udevdir:              $udevdir