mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow MSGFMT, MSGUNIQ to be overridden

Browse Source 
...and fail already in configure when only MSGFMT but not MSGUNIQ is overridden

Change-Id: I5dadca9f44f46e830b8321be11deaa4252f5b596
This commit is contained in:
Stephan Bergmann
2017-08-07 07:57:12 +02:00
parent 88179e3de8
commit d031f9e24f
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
configure.ac
View File

@@ -11594,21 +11594,28 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
else
AC_MSG_RESULT([$WITH_LANG])
GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES"
if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then
MSGFMT="$LODE_HOME/opt/bin/msgfmt"
MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
elif test -x "/opt/lo/bin/msgfmt"; then
MSGFMT="/opt/lo/bin/msgfmt"
MSGUNIQ="/opt/lo/bin/msguniq"
fi
if test -z "$MSGFMT"; then
AC_CHECK_PROGS(MSGFMT, [msgfmt])
if test -z "$MSGFMT"; then
AC_MSG_ERROR([msgfmt not found. Install GNU gettext, or re-run without languages.])
if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then
MSGFMT="$LODE_HOME/opt/bin/msgfmt"
elif test -x "/opt/lo/bin/msgfmt"; then
MSGFMT="/opt/lo/bin/msgfmt"
else
AC_CHECK_PROGS(MSGFMT, [msgfmt])
if test -z "$MSGFMT"; then
AC_MSG_ERROR([msgfmt not found. Install GNU gettext, or re-run without languages.])
fi
fi
AC_CHECK_PROGS(MSGUNIQ, [msguniq])
if test -z "$MSGUNIQ"; then
AC_MSG_ERROR([msguniq not found. Install GNU gettext, or re-run without languages.])
fi
if test -z "$MSGUNIQ"; then
if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msguniq" ; then
MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
elif test -x "/opt/lo/bin/msguniq"; then
MSGUNIQ="/opt/lo/bin/msguniq"
else
AC_CHECK_PROGS(MSGUNIQ, [msguniq])
if test -z "$MSGUNIQ"; then
AC_MSG_ERROR([msguniq not found. Install GNU gettext, or re-run without languages.])
fi
fi
fi
fi