mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle AVAILABLE_LANGUAGES more portably.

Browse source 
Fix a typo in BDB configuration.
This commit is contained in:
tim@donna.mysql.com 2001-01-16 21:36:43 +02:00
parent 3ca140edb3
commit 5f4a3f5167
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acinclude.m4
View file

@ -837,7 +837,7 @@ AC_DEFUN([MYSQL_TOP_BUILDDIR], [
/* ) ;; # already an absolute path
* ) [$1]="'\$(top_builddir)/'$[$1]" ;;
esac
if X"$[$1]" != "/"
if test X"$[$1]" != "/"
then
[$1]=`echo $[$1] | sed -e 's,/$,,'`
fi

19
configure.in
View file

@ -30,6 +30,18 @@ czech danish dutch english estonian french german greek hungarian \
italian japanese korean norwegian norwegian-ny polish portuguese \
romanian russian slovak spanish swedish"
# Generate make rules for all error messages
AVAILABLE_LANGUAGES_ERRORS=
AVAILABLE_LANGUAGES_ERRORS_RULES=$srcdir/ac_available_languages_fragment
rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
for i in $AVAILABLE_LANGUAGES
do
AVAILABLE_LANGUAGES_ERRORS="$AVAILABLE_LANGUAGES_ERRORS $i/errmsg.sys"
echo "$i/errmsg.sys: $i/errmsg.txt
\$(top_srdir)/extra/comp_err $i/errmsg.txt $i/errmsg.sys" \
>> $AVAILABLE_LANGUAGES_ERRORS_RULES
done
#####
#####
@ -42,6 +54,8 @@ AC_SUBST(DOT_FRM_VERSION)
AC_DEFINE_UNQUOTED(DOT_FRM_VERSION, $DOT_FRM_VERSION)
AC_SUBST(SHARED_LIB_VERSION)
AC_SUBST(AVAILABLE_LANGUAGES)
AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)
AC_SUBST_FILE(AVAILABLE_LANGUAGES_ERRORS_RULES)
# Canonicalize the configuration name.
SYSTEM_TYPE="$host_vendor-$host_os"
@ -1911,7 +1925,10 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
tests/Makefile Docs/Makefile support-files/Makefile \
mysql-test/Makefile \
include/mysql_version.h
, , [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
, , [
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
])
echo
echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the"

8
sql/share/Makefile.am
View file

@ -1,16 +1,14 @@
## Process this file with automake to create Makefile.in
ERRMSG=$(patsubst %, %/errmsg.sys, @AVAILABLE_LANGUAGES@)
# This requires gnu cp at distribution time.
dist-hook:
for lang in @AVAILABLE_LANGUAGES@ charsets; \
do cp -a $(srcdir)/$$lang $(distdir); done
all: $(ERRMSG)
all: @AVAILABLE_LANGUAGES_ERRORS@
$(ERRMSG): %.sys: %.txt
../../extra/comp_err $< $@
# this is ugly, but portable
@AVAILABLE_LANGUAGES_ERRORS_RULES@
install-data-local:
for lang in @AVAILABLE_LANGUAGES@; \