FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to better support the native irix compilers.

Browse Source
This commit is contained in:
curt 2002-09-06 15:30:11 +00:00
parent c3bdd0e537
commit 87dcaf5a00
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
autogen.sh
View File

@ -17,14 +17,8 @@ echo -n " automake: `automake --version | head -1 | awk '{print $4}'`"
echo " ($AUTO_MAKE_VERSION)" echo " ($AUTO_MAKE_VERSION)"
echo "" echo ""
ACLOCAL_OPTS="" echo "Running aclocal"
if [ $AUTO_MAKE_VERSION -ge 14 ]; then aclocal
if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then echo " -I ."
ACLOCAL_OPTS="-I ."
fi
fi
echo "Running aclocal $ACLOCAL_OPTS"
aclocal $ACLOCAL_OPTS
echo "Running autoheader" echo "Running autoheader"
autoheader autoheader
@ -33,14 +27,8 @@ if [ ! -e simgear/simgear_config.h.in ]; then
exit 1 exit 1
fi fi
echo -n "Running automake" echo "Running automake --add-missing"
if [ $OSTYPE = "IRIX" -o $OSTYPE = "IRIX64" ]; then
echo " --add-missing --include-deps"
automake --add-missing --include-deps
else
echo " --add-missing"
automake --add-missing automake --add-missing
fi
echo "Running autoconf" echo "Running autoconf"
autoconf autoconf
@ -50,16 +38,6 @@ if [ ! -e configure ]; then
exit 1 exit 1
fi fi
# fixup Makefiles for Irix
if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
echo "Fixing Makefiles for Irix"
for n in `find . -name Makefile.in`; do \
mv -f $n $n.ar-new; \
sed 's/$(AR) cru /$(AR) -o /g' $n.ar-new > $n; \
rm -f $n.ar-new; \
done;
fi
echo "" echo ""
echo "======================================" echo "======================================"

10
configure.ac
View File

@ -38,14 +38,20 @@ AC_PROG_RANLIB
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
# Used on the Irix platform
AR="ar" AR="ar"
ARFLAGS="cru"
OS=`uname -s` OS=`uname -s`
if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
if test "$CXX" = "CC"; then if test "$CXX" = "CC"; then
AR="CC -ar" AR="CC -ar"
ARFLAGS="-o"
fi
fi
AC_SUBST(AR) AC_SUBST(AR)
fi AC_SUBST(ARFLAGS)
fi
if echo $includedir | egrep "simgear$" > /dev/null; then if echo $includedir | egrep "simgear$" > /dev/null; then
echo "includedir is" $includedir "libdir is" $libdir echo "includedir is" $includedir "libdir is" $libdir