beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

configure: Don't use ancient and confusing shell syntax

Browse source 
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:
Andrew Shadura 2016-08-16 18:26:14 +01:00
parent dff13408f8
commit e4e1616159
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configure.ac
View file

@ -14,7 +14,7 @@ AC_SUBST([ASM_VERSION], [sparkleshare_version])
dnl pkg-config
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])
fi
@ -39,16 +39,16 @@ AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug],
[Use 'DEBUG' Configuration [default=YES]]),
enable_debug=yes, enable_debug=no)
AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes)
if test "x$enable_debug" = "xyes" ; then
AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
if test "$enable_debug" = "yes" ; then
CONFIG_REQUESTED="yes"
fi
AC_ARG_ENABLE(release,
AC_HELP_STRING([--enable-release],
[Use 'RELEASE' Configuration [default=NO]]),
enable_release=yes, enable_release=no)
AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
if test "x$enable_release" = "xyes" ; then
AM_CONDITIONAL(ENABLE_RELEASE, test "$enable_release" = "yes")
if test "$enable_release" = "yes" ; then
CONFIG_REQUESTED="yes"
fi
if test -z "$CONFIG_REQUESTED" ; then
@ -70,19 +70,19 @@ if test "$OSNAME" = "Linux" ; then
dnl check for webkit2-sharp
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_SUBST(WEBKIT2_SHARP_LIBS)
fi
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],
enable_appindicator="yes", enable_appindicator="no")
fi
if test x$enable_appindicator = xyes ; then
if test "$enable_appindicator" = "yes" ; then
PKG_CHECK_EXISTS([appindicator3-sharp-0.1 >= $APPINDICATOR_REQUIRED],,
AC_MSG_ERROR([appindicator3-sharp-0.1 is not installed]))
@ -95,8 +95,8 @@ if test "$OSNAME" = "Linux" ; then
GUISUBDIRS=SparkleShare
fi
AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
AM_CONDITIONAL(BUILD_XDG_APP, test x"$prefix" = "/app")
AM_CONDITIONAL(HAVE_APP_INDICATOR, test "$enable_appindicator" = "yes")
AM_CONDITIONAL(BUILD_XDG_APP, test "$prefix" = "/app")
AC_SUBST([GUISUBDIRS])
SHAMROCK_CHECK_NUNIT