зеркало из https://github.com/mozilla/gecko-dev.git
Get Irix autoconf build a bit farther along -- thanks to var@sgi.com
This commit is contained in:
Родитель
982dd9b3f2
Коммит
073ae0ab49
50
configure.in
50
configure.in
|
@ -123,7 +123,7 @@ DSO_CFLAGS='-KPIC'
|
|||
|
||||
dnl gcc can come with its own linker so its better to use the pass-thru calls
|
||||
dnl ========================================================
|
||||
if test "$GNU_CC" = 1; then
|
||||
if [ test "$GNU_CC" = 1]; then
|
||||
MKSHLIB='$(CC) $(DSO_LDOPTS)'
|
||||
DSO_LDOPTS='-shared -Wl,-h -Wl,$(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))'
|
||||
DSO_CFLAGS='-fPIC'
|
||||
|
@ -151,6 +151,10 @@ alpha-*-linux*)
|
|||
DLL_SUFFIX="so.1.0"
|
||||
fi ;;
|
||||
|
||||
*-irix*)
|
||||
AC_DEFINE(IRIX6_3)
|
||||
|
||||
|
||||
esac
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
|
@ -258,6 +262,50 @@ else
|
|||
fi
|
||||
CC=$_SAVE_CC
|
||||
|
||||
dnl Checks for c++ features
|
||||
dnl Is there a way to make AC_TRY_COMPILE use CXX instead of CC?
|
||||
_SAVE_CC=$CC
|
||||
CC=$CXX
|
||||
AC_MSG_CHECKING(for ios::bin)
|
||||
AC_CACHE_VAL(ac_cv_ios_bin,
|
||||
[AC_TRY_COMPILE([#include <iostream.h>]
|
||||
[#include <fstream.h>],
|
||||
[char *buffer = "config.log";
|
||||
fstream *mFileStream=new fstream(buffer, ios::bin);],
|
||||
[ac_ios_bin=true],
|
||||
[ac_ios_bin=false])
|
||||
ac_cv_ios_bin=$ac_ios_bin])
|
||||
ac_ios_bin=$ac_cv_ios_bin
|
||||
if test $ac_ios_bin = true ; then
|
||||
AC_DEFINE(HAVE_IOS_BIN)
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
CC=$_SAVE_CC
|
||||
|
||||
dnl Checks for c++ features
|
||||
dnl Is there a way to make AC_TRY_COMPILE use CXX instead of CC?
|
||||
_SAVE_CC=$CC
|
||||
CC=$CXX
|
||||
AC_MSG_CHECKING(for ios::bin)
|
||||
AC_CACHE_VAL(ac_cv_ios_bin,
|
||||
[AC_TRY_COMPILE([#include <iostream.h>]
|
||||
[#include <fstream.h>],
|
||||
[char *buffer = "config.log";
|
||||
fstream *mFileStream=new fstream(buffer, ios::bin);],
|
||||
[ac_ios_bin=true],
|
||||
[ac_ios_bin=false])
|
||||
ac_cv_ios_bin=$ac_ios_bin])
|
||||
ac_ios_bin=$ac_cv_ios_bin
|
||||
if test $ac_ios_bin = true ; then
|
||||
AC_DEFINE(HAVE_IOS_BIN)
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
CC=$_SAVE_CC
|
||||
|
||||
dnl Checks for libraries.
|
||||
dnl ========================================================
|
||||
AC_CHECK_LIB(c_r, gethostbyname_r)
|
||||
|
|
|
@ -75,8 +75,10 @@ CScanner::CScanner(nsString& aFilename,PRBool aCreateStream) :
|
|||
#if defined(HAVE_IOS_BINARY) || !defined(XP_UNIX)
|
||||
/* XXX: HAVE_IOS_BINARY needs to be set for mac & win */
|
||||
mFileStream=new fstream(buffer,ios::in|ios::binary);
|
||||
#else
|
||||
#elif defined(HAVE_IOS_BIN)
|
||||
mFileStream=new fstream(buffer,ios::in|ios::bin);
|
||||
#else
|
||||
mFileStream=new fstream(buffer,ios::in);
|
||||
#endif
|
||||
} //if
|
||||
}
|
||||
|
|
|
@ -75,8 +75,10 @@ CScanner::CScanner(nsString& aFilename,PRBool aCreateStream) :
|
|||
#if defined(HAVE_IOS_BINARY) || !defined(XP_UNIX)
|
||||
/* XXX: HAVE_IOS_BINARY needs to be set for mac & win */
|
||||
mFileStream=new fstream(buffer,ios::in|ios::binary);
|
||||
#else
|
||||
#elif defined(HAVE_IOS_BIN)
|
||||
mFileStream=new fstream(buffer,ios::in|ios::bin);
|
||||
#else
|
||||
mFileStream=new fstream(buffer,ios::in);
|
||||
#endif
|
||||
} //if
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче