Add a seperate check for wxwin.m4 and wxwin28.m4, Linux names them different
than I see here on FreeBSD, more names may be added later. Originally committed to SVN as r2104.
This commit is contained in:
parent
a86a882c0a
commit
67fc793c90
1 changed files with 32 additions and 11 deletions
43
autogen.sh
43
autogen.sh
|
@ -22,6 +22,7 @@ INTLTOOL_REQUIRED_VERSION=0.31
|
||||||
LIBTOOL_REQUIRED_VERSION=1.5
|
LIBTOOL_REQUIRED_VERSION=1.5
|
||||||
|
|
||||||
REQUIRED_M4="fontutil.m4 wxwin28.m4 glib-gettext.m4 intltool.m4 intl.m4 pkg.m4 iconv.m4"
|
REQUIRED_M4="fontutil.m4 wxwin28.m4 glib-gettext.m4 intltool.m4 intl.m4 pkg.m4 iconv.m4"
|
||||||
|
REQUIRED_M4_WX="wxwin.m4 wxwin28.m4"
|
||||||
|
|
||||||
PROJECT="aegisub"
|
PROJECT="aegisub"
|
||||||
|
|
||||||
|
@ -218,22 +219,42 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
echo "--- Checking for required M4 files ---"
|
||||||
|
|
||||||
if test -z "$ACLOCAL_FLAGS"; then
|
if test -z "$ACLOCAL_FLAGS"; then
|
||||||
acdir=`$ACLOCAL --print-ac-dir`
|
acdir=`$ACLOCAL --print-ac-dir`
|
||||||
|
|
||||||
for file in $REQUIRED_M4;
|
for file in $REQUIRED_M4; do
|
||||||
do
|
if [ ! -f "$acdir/$file" ]; then
|
||||||
if [ ! -f "$acdir/$file" ]; then
|
echo
|
||||||
echo
|
echo "WARNING: aclocal's directory is $acdir, but..."
|
||||||
echo "WARNING: aclocal's directory is $acdir, but..."
|
echo " no file $acdir/$file"
|
||||||
echo " no file $acdir/$file"
|
echo " You may see fatal macro warnings below."
|
||||||
echo " You may see fatal macro warnings below."
|
echo " If these files are installed in /some/dir, set the "
|
||||||
echo " If these files are installed in /some/dir, set the "
|
echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\""
|
||||||
echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\""
|
echo " or install $acdir/$file."
|
||||||
echo " or install $acdir/$file."
|
echo
|
||||||
echo
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
for file in $REQUIRED_M4_WX; do
|
||||||
|
if [ -f "$acdir/$file" ]; then
|
||||||
|
FOUND_M4_WX="yes"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if test -z "$FOUND_M4_WX"; then
|
||||||
|
echo
|
||||||
|
echo "WARNING: aclocal's directory is $acdir, but..."
|
||||||
|
echo " none of: \"$REQUIRED_M4_WX\" were found."
|
||||||
|
echo " You may see fatal macro warnings below."
|
||||||
|
echo " If these files are installed in /some/dir, set the "
|
||||||
|
echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\""
|
||||||
|
echo " or install ONE OF: \"$REQUIRED_M4_WX\" in $acdir."
|
||||||
|
echo "NOTE: These are the same files under different names."
|
||||||
|
echo
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue