configure: Don't use ancient and confusing shell syntax
Prepending "x" to test arguments isn't needed if proper quoting is used; POSIX is pretty clear on that. This confusing x prefix has also masked a bug on line 99, where a condition was never true due to a missing x on the right side of the comparison. Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
This commit is contained in:
parent
dff13408f8
commit
e4e1616159
20
configure.ac
20
configure.ac
|
@ -14,7 +14,7 @@ AC_SUBST([ASM_VERSION], [sparkleshare_version])
|
||||||
|
|
||||||
dnl pkg-config
|
dnl pkg-config
|
||||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||||
if test "x$PKG_CONFIG" = "xno"; then
|
if test "$PKG_CONFIG" = "no"; then
|
||||||
AC_MSG_ERROR([pkg-config is not installed])
|
AC_MSG_ERROR([pkg-config is not installed])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -39,16 +39,16 @@ AC_ARG_ENABLE(debug,
|
||||||
AC_HELP_STRING([--enable-debug],
|
AC_HELP_STRING([--enable-debug],
|
||||||
[Use 'DEBUG' Configuration [default=YES]]),
|
[Use 'DEBUG' Configuration [default=YES]]),
|
||||||
enable_debug=yes, enable_debug=no)
|
enable_debug=yes, enable_debug=no)
|
||||||
AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes)
|
AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
|
||||||
if test "x$enable_debug" = "xyes" ; then
|
if test "$enable_debug" = "yes" ; then
|
||||||
CONFIG_REQUESTED="yes"
|
CONFIG_REQUESTED="yes"
|
||||||
fi
|
fi
|
||||||
AC_ARG_ENABLE(release,
|
AC_ARG_ENABLE(release,
|
||||||
AC_HELP_STRING([--enable-release],
|
AC_HELP_STRING([--enable-release],
|
||||||
[Use 'RELEASE' Configuration [default=NO]]),
|
[Use 'RELEASE' Configuration [default=NO]]),
|
||||||
enable_release=yes, enable_release=no)
|
enable_release=yes, enable_release=no)
|
||||||
AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
|
AM_CONDITIONAL(ENABLE_RELEASE, test "$enable_release" = "yes")
|
||||||
if test "x$enable_release" = "xyes" ; then
|
if test "$enable_release" = "yes" ; then
|
||||||
CONFIG_REQUESTED="yes"
|
CONFIG_REQUESTED="yes"
|
||||||
fi
|
fi
|
||||||
if test -z "$CONFIG_REQUESTED" ; then
|
if test -z "$CONFIG_REQUESTED" ; then
|
||||||
|
@ -70,19 +70,19 @@ if test "$OSNAME" = "Linux" ; then
|
||||||
|
|
||||||
dnl check for webkit2-sharp
|
dnl check for webkit2-sharp
|
||||||
PKG_CHECK_MODULES(WEBKIT2_SHARP, webkit2-sharp-4.0, have_webkit2_sharp=yes, have_webkit2_sharp=no)
|
PKG_CHECK_MODULES(WEBKIT2_SHARP, webkit2-sharp-4.0, have_webkit2_sharp=yes, have_webkit2_sharp=no)
|
||||||
if test "x$have_webkit2_sharp" = "xno" ; then
|
if test "$have_webkit2_sharp" = "no" ; then
|
||||||
AC_MSG_ERROR([webkit2-sharp-4.0 is not installed])
|
AC_MSG_ERROR([webkit2-sharp-4.0 is not installed])
|
||||||
AC_SUBST(WEBKIT2_SHARP_LIBS)
|
AC_SUBST(WEBKIT2_SHARP_LIBS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
APPINDICATOR_REQUIRED=0.1
|
APPINDICATOR_REQUIRED=0.1
|
||||||
|
|
||||||
if test x$enable_appindicator = xauto ; then
|
if test "$enable_appindicator" = "auto" ; then
|
||||||
PKG_CHECK_EXISTS([appindicator3-sharp-0.1 >= $APPINDICATOR_REQUIRED],
|
PKG_CHECK_EXISTS([appindicator3-sharp-0.1 >= $APPINDICATOR_REQUIRED],
|
||||||
enable_appindicator="yes", enable_appindicator="no")
|
enable_appindicator="yes", enable_appindicator="no")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$enable_appindicator = xyes ; then
|
if test "$enable_appindicator" = "yes" ; then
|
||||||
PKG_CHECK_EXISTS([appindicator3-sharp-0.1 >= $APPINDICATOR_REQUIRED],,
|
PKG_CHECK_EXISTS([appindicator3-sharp-0.1 >= $APPINDICATOR_REQUIRED],,
|
||||||
AC_MSG_ERROR([appindicator3-sharp-0.1 is not installed]))
|
AC_MSG_ERROR([appindicator3-sharp-0.1 is not installed]))
|
||||||
|
|
||||||
|
@ -95,8 +95,8 @@ if test "$OSNAME" = "Linux" ; then
|
||||||
GUISUBDIRS=SparkleShare
|
GUISUBDIRS=SparkleShare
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
|
AM_CONDITIONAL(HAVE_APP_INDICATOR, test "$enable_appindicator" = "yes")
|
||||||
AM_CONDITIONAL(BUILD_XDG_APP, test x"$prefix" = "/app")
|
AM_CONDITIONAL(BUILD_XDG_APP, test "$prefix" = "/app")
|
||||||
|
|
||||||
AC_SUBST([GUISUBDIRS])
|
AC_SUBST([GUISUBDIRS])
|
||||||
SHAMROCK_CHECK_NUNIT
|
SHAMROCK_CHECK_NUNIT
|
||||||
|
|
Loading…
Reference in a new issue