We can't use shell conditionals to decide whether to run m4 code or not

Put the definition of the PKG_CHECK_MODULES m4 macro (as empty, for
macOS) inside a m4_if that checks uname, not inside a shell if
statement.
private/kendy/mobile
Tor Lillqvist 2018-10-30 12:37:31 +02:00
parent 143527b4c8
commit d5c5a17750
1 changed files with 3 additions and 1 deletions

View File

@ -10,6 +10,9 @@ AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
AC_CONFIG_MACRO_DIR([m4])
# We don't want to require pkg-config and PKG_CHECK_MODULES on macOS
m4_if(m4_esyscmd_s([uname -s]),Linux,[],[m4_define([PKG_CHECK_MODULES],[])])
LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
@ -204,7 +207,6 @@ ENABLE_IOSAPP=
IOSAPP_NAME="Mobile"
if test "$enable_iosapp" = "yes"; then
ENABLE_IOSAPP=true
m4_define([PKG_CHECK_MODULES],[])
if test -n "$with_iosapp_name"; then
IOSAPP_NAME="$with_iosapp_name"
fi