diff options
-rw-r--r-- | rules/bonniexx.make | 2 | ||||
-rw-r--r-- | rules/iputils.make | 4 | ||||
-rw-r--r-- | rules/krb5.make | 2 | ||||
-rw-r--r-- | rules/less.make | 6 | ||||
-rw-r--r-- | rules/libcap.make | 2 | ||||
-rw-r--r-- | rules/mosquitto.make | 8 | ||||
-rw-r--r-- | rules/nginx.make | 2 | ||||
-rw-r--r-- | rules/pciutils.make | 6 | ||||
-rw-r--r-- | rules/php5.make | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/rules/bonniexx.make b/rules/bonniexx.make index 533f21c28..da862a669 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -32,7 +32,7 @@ BONNIEXX_LICENSE := GPL-2.0-only BONNIEXX_ENV := \ $(CROSS_ENV) \ - bonnie_cv_sys_largefile=$(call ptx/ifdef,PTXCONF_GLOBAL_LARGE_FILE,yes,no) + bonnie_cv_sys_largefile=$(call ptx/yesno, PTXCONF_GLOBAL_LARGE_FILE) # # autoconf diff --git a/rules/iputils.make b/rules/iputils.make index 7c84d5034..b22c6b631 100644 --- a/rules/iputils.make +++ b/rules/iputils.make @@ -44,8 +44,8 @@ IPUTILS_CONF_TOOL := NO IPUTILS_MAKEVARS := \ $(CROSS_ENV) \ USE_IDN=no \ - USE_GCRYPT=$(call ptx/ifdef, PTXCONF_IPUTILS_GCRYPT, yes, no) \ - USE_NETTLE=$(call ptx/ifdef, PTXCONF_IPUTILS_NETTLE, yes, no) \ + USE_GCRYPT=$(call ptx/yesno, PTXCONF_IPUTILS_GCRYPT) \ + USE_NETTLE=$(call ptx/yesno, PTXCONF_IPUTILS_NETTLE) \ USE_CRYPTO=$(call ptx/ifdef, PTXCONF_IPUTILS_OPENSSL, shared, no) \ TARGETS="$(IPUTILS_TOOLS-y)" diff --git a/rules/krb5.make b/rules/krb5.make index a47907e39..934bd7e10 100644 --- a/rules/krb5.make +++ b/rules/krb5.make @@ -41,7 +41,7 @@ KRB5_CONF_ENV := \ ac_cv_printf_positional=yes \ ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no \ - ac_cv_header_keyutils_h=$(call ptx/ifdef, PTXCONF_KRB5_CLIENT_TOOLS, yes, no) + ac_cv_header_keyutils_h=$(call ptx/yesno, PTXCONF_KRB5_CLIENT_TOOLS) # # autoconf diff --git a/rules/less.make b/rules/less.make index 1a4ff3e0f..94a39d8aa 100644 --- a/rules/less.make +++ b/rules/less.make @@ -33,10 +33,10 @@ LESS_CONF_ENV := \ $(CROSS_ENV) \ ac_cv_lib_tinfo_tgoto=no \ ac_cv_lib_xcurses_initscr=no \ - ac_cv_lib_ncursesw_initscr=$(call ptx/ifdef,PTXCONF_LESS_NCURSESW,yes,no) \ - ac_cv_lib_ncurses_initscr=$(call ptx/ifdef,PTXCONF_LESS_NCURSES,yes,no) \ + ac_cv_lib_ncursesw_initscr=$(call ptx/yesno, PTXCONF_LESS_NCURSESW) \ + ac_cv_lib_ncurses_initscr=$(call ptx/yesno, PTXCONF_LESS_NCURSES) \ ac_cv_lib_curses_initscr=no \ - ac_cv_lib_termcap_tgetent=$(call ptx/ifdef,PTXCONF_LESS_USE_TERMCAP,yes,no) \ + ac_cv_lib_termcap_tgetent=$(call ptx/yesno, PTXCONF_LESS_USE_TERMCAP) \ ac_cv_lib_termlib_tgetent=no # diff --git a/rules/libcap.make b/rules/libcap.make index 048794e3d..3011b43b1 100644 --- a/rules/libcap.make +++ b/rules/libcap.make @@ -33,7 +33,7 @@ LIBCAP_LICENSE_FILES := file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1 LIBCAP_MAKE_OPT := \ prefix=/usr PAM_CAP=no DYNAMIC=yes \ - LIBATTR=$(call ptx/ifdef, PTXCONF_LIBCAP_SETCAP,yes,no) \ + LIBATTR=$(call ptx/yesno, PTXCONF_LIBCAP_SETCAP) \ lib=lib \ CC=$(CROSS_CC) \ BUILD_CC=$(HOSTCC) diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 4372fc0a0..3ebcf9f33 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -38,15 +38,15 @@ MOSQUITTO_MAKE_OPT := \ UNAME=Linux \ prefix=/usr \ WITH_WRAP=no \ - WITH_TLS=$(call ptx/ifdef, PTXCONF_MOSQUITTO_TLS, yes, no) \ - WITH_TLS_PSK=$(call ptx/ifdef, PTXCONF_MOSQUITTO_TLS, yes, no) \ + WITH_TLS=$(call ptx/yesno, PTXCONF_MOSQUITTO_TLS) \ + WITH_TLS_PSK=$(call ptx/yesno, PTXCONF_MOSQUITTO_TLS) \ WITH_THREADING=yes \ WITH_BRIDGE=yes \ WITH_PERSISTENCE=yes \ WITH_MEMORY_TRACKING=yes \ WITH_SYS_TREE=yes \ - WITH_SRV=$(call ptx/ifdef, PTXCONF_MOSQUITTO_SRV, yes, no) \ - WITH_UUID=$(call ptx/ifdef, PTXCONF_MOSQUITTO_UUID, yes, no) \ + WITH_SRV=$(call ptx/yesno, PTXCONF_MOSQUITTO_SRV) \ + WITH_UUID=$(call ptx/yesno, PTXCONF_MOSQUITTO_UUID) \ WITH_WEBSOCKETS=no \ WITH_EC=yes \ WITH_DOCS=no \ diff --git a/rules/nginx.make b/rules/nginx.make index bdadc6b64..3dc0c3724 100644 --- a/rules/nginx.make +++ b/rules/nginx.make @@ -46,7 +46,7 @@ NGINX_CONF_ENV := \ ngx_force_have_map_devzero=yes \ ngx_force_have_sysvshm=yes \ ngx_force_have_posix_sem=yes \ - ngx_force_ipv6=$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6, yes, no) + ngx_force_ipv6=$(call ptx/yesno, PTXCONF_GLOBAL_IPV6) ifdef PTXCONF_ENDIAN_LITTLE NGINX_CONF_ENV += ngx_force_have_little_endian=yes diff --git a/rules/pciutils.make b/rules/pciutils.make index 75a0b6dbf..d4b735900 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -39,9 +39,9 @@ PCIUTILS_MAKE_OPT := \ SBINDIR='\$$(PREFIX)/bin' \ HOST=$(PTXCONF_ARCH_STRING)-linux \ RELEASE=$(KERNEL_HEADER_VERSION) \ - ZLIB=$(call ptx/ifdef,PTXCONF_PCIUTILS_COMPRESS,yes,no) \ - LIBKMOD=$(call ptx/ifdef,PTXCONF_PCIUTILS_LIBKMOD,yes,no) \ - SHARED=$(call ptx/ifdef,PTXCONF_PCIUTILS_LIBPCI,yes,no) \ + ZLIB=$(call ptx/yesno, PTXCONF_PCIUTILS_COMPRESS) \ + LIBKMOD=$(call ptx/yesno, PTXCONF_PCIUTILS_LIBKMOD) \ + SHARED=$(call ptx/yesno, PTXCONF_PCIUTILS_LIBPCI) \ STRIP= \ DNS=no \ HWDB=no diff --git a/rules/php5.make b/rules/php5.make index 1a6b7e187..c6aea8e81 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -41,7 +41,7 @@ PHP5_URL := \ PHP5_CONF_ENV := \ $(CROSS_ENV) \ ac_cv_prog_cc_cross=yes \ - ac_cv_c_bigendian_php=$(call ptx/ifdef, PTXCONF_ENDIAN_BIG, yes, no) + ac_cv_c_bigendian_php=$(call ptx/yesno, PTXCONF_ENDIAN_BIG) # # autoconf |