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
25
autogen.sh
25
autogen.sh
|
@ -22,6 +22,7 @@ INTLTOOL_REQUIRED_VERSION=0.31
|
|||
LIBTOOL_REQUIRED_VERSION=1.5
|
||||
|
||||
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"
|
||||
|
||||
|
@ -218,11 +219,12 @@ fi
|
|||
|
||||
|
||||
|
||||
echo "--- Checking for required M4 files ---"
|
||||
|
||||
if test -z "$ACLOCAL_FLAGS"; then
|
||||
acdir=`$ACLOCAL --print-ac-dir`
|
||||
|
||||
for file in $REQUIRED_M4;
|
||||
do
|
||||
for file in $REQUIRED_M4; do
|
||||
if [ ! -f "$acdir/$file" ]; then
|
||||
echo
|
||||
echo "WARNING: aclocal's directory is $acdir, but..."
|
||||
|
@ -234,6 +236,25 @@ if test -z "$ACLOCAL_FLAGS"; then
|
|||
echo
|
||||
fi
|
||||
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
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue