Merge pull request #1715 from andrewshadura/master
Two more changes to configure.
This commit is contained in:
Hylke Bons
GitHub
commit
2f2e4b79b9
75
configure.ac
75
configure.ac
|
|
@ -14,8 +14,8 @@ AC_SUBST([ASM_VERSION], [sparkleshare_version])
|
|||
|
||||
dnl pkg-config
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
if test "x$PKG_CONFIG" = "xno"; then
|
||||
AC_MSG_ERROR([pkg-config is not installed])
|
||||
if test "$PKG_CONFIG" = "no"; then
|
||||
AC_MSG_ERROR([pkg-config is not installed])
|
||||
fi
|
||||
|
||||
SHAMROCK_EXPAND_LIBDIR
|
||||
|
|
@ -27,30 +27,31 @@ AC_PROG_INSTALL
|
|||
dnl Mono and mcs
|
||||
SHAMROCK_CHECK_MONO_MODULE(3.2.8)
|
||||
SHAMROCK_FIND_MONO_RUNTIME
|
||||
|
||||
|
||||
PKG_CHECK_EXISTS([mono >= 3.2.8],
|
||||
[SHAMROCK_FIND_MONO_4_5_COMPILER
|
||||
SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
|
||||
System
|
||||
])]
|
||||
)
|
||||
[SHAMROCK_FIND_MONO_4_5_COMPILER
|
||||
SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
|
||||
System
|
||||
])])
|
||||
|
||||
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
|
||||
AM_CONDITIONAL(ENABLE_DEBUG, true)
|
||||
enable_debug=yes
|
||||
|
|
@ -70,19 +71,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,34 +96,34 @@ 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
|
||||
SHAVE_INIT([build/m4/shave], [enable])
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
build/Makefile
|
||||
build/m4/Makefile
|
||||
build/m4/shave/shave
|
||||
build/m4/shave/shave-libtool
|
||||
Sparkles/InstallationInfo.Directory.cs
|
||||
Sparkles/Makefile
|
||||
Sparkles/Git/Makefile
|
||||
SparkleShare/Makefile
|
||||
SparkleShare/Common/Makefile
|
||||
SparkleShare/Common/HTML/Makefile
|
||||
SparkleShare/Common/Presets/Makefile
|
||||
SparkleShare/Common/Images/Makefile
|
||||
SparkleShare/Linux/Makefile
|
||||
SparkleShare/Linux/Images/Makefile
|
||||
SparkleShare/Linux/Images/icons/Makefile
|
||||
SparkleShare/Linux/Images/icons/hicolor/Makefile
|
||||
SparkleShare/Linux/Images/icons/ubuntu-mono-dark/Makefile
|
||||
SparkleShare/Linux/Images/icons/ubuntu-mono-light/Makefile
|
||||
SparkleShare/Linux/sparkleshare
|
||||
Makefile
|
||||
build/Makefile
|
||||
build/m4/Makefile
|
||||
build/m4/shave/shave
|
||||
build/m4/shave/shave-libtool
|
||||
Sparkles/InstallationInfo.Directory.cs
|
||||
Sparkles/Makefile
|
||||
Sparkles/Git/Makefile
|
||||
SparkleShare/Makefile
|
||||
SparkleShare/Common/Makefile
|
||||
SparkleShare/Common/HTML/Makefile
|
||||
SparkleShare/Common/Presets/Makefile
|
||||
SparkleShare/Common/Images/Makefile
|
||||
SparkleShare/Linux/Makefile
|
||||
SparkleShare/Linux/Images/Makefile
|
||||
SparkleShare/Linux/Images/icons/Makefile
|
||||
SparkleShare/Linux/Images/icons/hicolor/Makefile
|
||||
SparkleShare/Linux/Images/icons/ubuntu-mono-dark/Makefile
|
||||
SparkleShare/Linux/Images/icons/ubuntu-mono-light/Makefile
|
||||
SparkleShare/Linux/sparkleshare
|
||||
])
|
||||
|
||||
echo "
|
||||
|
|
|
|||
Loading…
Reference in a new issue