configure.ac | 7 ------- 1 file changed, 7 deletions(-) New commits: commit 3e26dd17b6ccb035a052a1c887e38d7928bdbb7e Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Thu Jul 23 16:14:03 2020 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Thu Jul 23 16:43:16 2020 +0200
AC_SUBST is enough for ENABLE_BROWSERSYNC Change-Id: I326b92817ecddcfe94f850b8c36e8644aa0bee60 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99289 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/configure.ac b/configure.ac index 95228526f..cdfd3aa65 100644 --- a/configure.ac +++ b/configure.ac @@ -339,11 +339,8 @@ AC_SUBST(ENABLE_DEBUG_PROTOCOL) ENABLE_BROWSERSYNC= browsersync_msg="disabled: copy files to the target directory" if test "$enable_browsersync" = "yes"; then - AC_DEFINE([ENABLE_BROWSERSYNC],1,[Whether to create symlinks instead of copying files to the target directory to run browsersync]) ENABLE_BROWSERSYNC=true browsersync_msg="enabled: create symlinks in the target directory" -else - AC_DEFINE([ENABLE_BROWSERSYNC],0,[Whether to create symlinks instead of copying files to the target directory to run browsersync]) fi AC_SUBST(ENABLE_BROWSERSYNC) @@ -909,7 +906,6 @@ AS_IF([test "$ENABLE_GTKAPP" = true], [PKG_CHECK_MODULES([WEBKIT],[webkit2gtk-4.0])]) AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"]) -AM_CONDITIONAL([ENABLE_BROWSERSYNC], [test "$ENABLE_BROWSERSYNC" = "true"]) mobile_app= ENABLE_MOBILEAPP= commit 25cda6de57e13615a3a821e0909098a01a2aff60 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Thu Jul 23 15:56:11 2020 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Thu Jul 23 16:43:02 2020 +0200 AM_CONDITIONAL is enough for ENABLE_CYPRESS The only use of ENABLE_CYPRESS is the 'if ENABLE_CYPRESS' line in cypress_test/Makefile.am. Change-Id: I5790b99f5fb437dd8ee5d0574189fd224eb3e4fe Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99288 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/configure.ac b/configure.ac index dfc3da14c..95228526f 100644 --- a/configure.ac +++ b/configure.ac @@ -1145,14 +1145,11 @@ ENABLE_CYPRESS=false if test "$enable_cypress" = "yes"; then cypress_msg="cypress is enabled" ENABLE_CYPRESS=true - AC_DEFINE([ENABLE_CYPRESS],1,[Whether to enable cypress tests]) else cypress_msg="cypress is disabled" ENABLE_CYPRESS=false - AC_DEFINE([ENABLE_CYPRESS],0,[Whether to enable cypress tests]) fi AM_CONDITIONAL([ENABLE_CYPRESS], [$ENABLE_CYPRESS]) -AC_SUBST(ENABLE_CYPRESS) AC_CONFIG_FILES([Makefile cypress_test/Makefile _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits