configure: Simplify inclusion of M4 macros
This commit is contained in:
+1
-9
@@ -33,21 +33,18 @@ AM_INIT_AUTOMAKE(m4_esyscmd([
|
|||||||
esac
|
esac
|
||||||
]))
|
]))
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
|
||||||
AC_CONFIG_MACRO_DIR([m4/config])
|
AC_CONFIG_MACRO_DIRS([m4/config m4/macros])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_DEFINE([CONFIG_H_INCLUDED], [], [defined if config.h included])
|
AC_DEFINE([CONFIG_H_INCLUDED], [], [defined if config.h included])
|
||||||
AC_DISABLE_STATIC
|
AC_DISABLE_STATIC
|
||||||
PKG_PROG_PKG_CONFIG
|
PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
m4_include(m4/macros/split-package-version.m4)
|
|
||||||
SPLIT_PACKAGE_VERSION
|
SPLIT_PACKAGE_VERSION
|
||||||
|
|
||||||
# =================================
|
# =================================
|
||||||
# check --enable-xxx & --with-xxx
|
# check --enable-xxx & --with-xxx
|
||||||
# =================================
|
# =================================
|
||||||
|
|
||||||
m4_include(m4/macros/with.m4)
|
|
||||||
|
|
||||||
ARG_WITH_SUBST([random-device], [/dev/random], [set the device to read real random data from])
|
ARG_WITH_SUBST([random-device], [/dev/random], [set the device to read real random data from])
|
||||||
ARG_WITH_SUBST([urandom-device], [/dev/urandom], [set the device to read pseudo random data from])
|
ARG_WITH_SUBST([urandom-device], [/dev/urandom], [set the device to read pseudo random data from])
|
||||||
ARG_WITH_SUBST([strongswan-conf], [${sysconfdir}/strongswan.conf], [set the strongswan.conf file location])
|
ARG_WITH_SUBST([strongswan-conf], [${sysconfdir}/strongswan.conf], [set the strongswan.conf file location])
|
||||||
@@ -129,8 +126,6 @@ fi
|
|||||||
# convert script name to uppercase
|
# convert script name to uppercase
|
||||||
AC_SUBST(ipsec_script_upper, [`echo -n "$ipsec_script" | tr a-z A-Z`])
|
AC_SUBST(ipsec_script_upper, [`echo -n "$ipsec_script" | tr a-z A-Z`])
|
||||||
|
|
||||||
m4_include(m4/macros/enable-disable.m4)
|
|
||||||
|
|
||||||
# crypto plugins
|
# crypto plugins
|
||||||
ARG_ENABL_SET([aes], [enable AES software implementation plugin.])
|
ARG_ENABL_SET([aes], [enable AES software implementation plugin.])
|
||||||
ARG_ENABL_SET([af-alg], [enable AF_ALG crypto interface to Linux Crypto API.])
|
ARG_ENABL_SET([af-alg], [enable AF_ALG crypto interface to Linux Crypto API.])
|
||||||
@@ -374,7 +369,6 @@ AC_SUBST(PLUGIN_CFLAGS)
|
|||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
m4_include(m4/macros/lib-prefix.m4)
|
|
||||||
AC_LIB_PREFIX
|
AC_LIB_PREFIX
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
@@ -1523,8 +1517,6 @@ CFLAGS="$WARN_CFLAGS $CFLAGS"
|
|||||||
# collect plugin list for strongSwan components
|
# collect plugin list for strongSwan components
|
||||||
# ===============================================
|
# ===============================================
|
||||||
|
|
||||||
m4_include(m4/macros/add-plugin.m4)
|
|
||||||
|
|
||||||
# plugin lists for all components
|
# plugin lists for all components
|
||||||
charon_plugins=
|
charon_plugins=
|
||||||
pool_plugins=
|
pool_plugins=
|
||||||
|
|||||||
Reference in New Issue
Block a user