Kaydet (Commit) 436ee098 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Get rid of odd ENABLE_SYMBOLS=FALSE

* None of the other ENABLE_* support anything but TRUE or empty.

* Other checks for -n "$ENABLE_SYMBOLS" in configure.ac are confused by it.

* solenv/gbuild/gbuild.help.txt talks about "If not empty", not mentioning "FALSE".

* A missing (redundant) explicit --disable-symbols left gb_SYMBOL uninitialized
  (instead of setting it to $(false))---but without consequences, as all the places
  checking gb_SYMBOL explicitly check for $(true).

Change-Id: Id004189de27a7936862dab3a5fd84d549c06af2b
Reviewed-on: https://gerrit.libreoffice.org/27057Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst bccb4302
...@@ -4044,11 +4044,7 @@ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then ...@@ -4044,11 +4044,7 @@ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
fi fi
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then ENABLE_SYMBOLS=
ENABLE_SYMBOLS="FALSE"
else
ENABLE_SYMBOLS=
fi
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_SYMBOLS) AC_SUBST(ENABLE_SYMBOLS)
......
...@@ -117,12 +117,10 @@ gb_Deliver_HARDLINK := $(true) ...@@ -117,12 +117,10 @@ gb_Deliver_HARDLINK := $(true)
endif endif
# note: ENABLE_CRASHDUMP turns on gb_SYMBOL # note: ENABLE_CRASHDUMP turns on gb_SYMBOL
ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
gb_SYMBOL := $(false)
else
ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),) ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
gb_SYMBOL := $(true) gb_SYMBOL := $(true)
endif else
gb_SYMBOL := $(false)
endif endif
ifneq ($(strip $(ENABLE_PCH)),) ifneq ($(strip $(ENABLE_PCH)),)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment