gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19702 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-07-10 03:07:56 +00:00
parent c302f8733d
commit db41f0f95d
4 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-07-09 Adam Fedor <fedor@gnu.org>
* configure.ac: Improve compiler type test.
* Documentation/gnustep.init: Fix template parsing rules.
2004-07-04 Adrian Robert <arobert@cogsci.ucsd.edu>
* Instance/Documentation/texi.make:

5
Documentation/gnustep.init
View file

@ -2,8 +2,8 @@ if (defined($ENV{'GNUSTEP_WEB_ROOT'})) {
open(TMPL,"<$ENV{'GNUSTEP_WEB_ROOT'}/secondary.html.template");
$tmpl=join("",<TMPL>);
close(TMPL);
($T2H_EXTRA_HEAD,$T2H_PRE_BODY_OPEN,$T2H_PRE_BODY_CLOSE) =
($tmpl=~/<\/title>(.*)<\/head>.*<body>(.*<div id="main">).*(<\/div>.*)<\/body>/sm);
($T2H_EXTRA_HEAD,$T2H_AFTER_BODY_OPEN,$T2H_PRE_BODY_CLOSE) =
($tmpl=~/<\/title>(.*)<\/head>.*<body>(.*<div id="main">).*(<\/div><\/div>.*)<\/body>/sm);
}
else {
# this is added inside <HEAD></HEAD> after <TITLE> and some META NAME stuff
@ -21,4 +21,3 @@ sub nothing
$T2H_print_About = \&nothing;
$T2H_SECTION_NAVIGATION = 0;
$T2H_print_navigation = \&nothing;

30
configure vendored
View file

@ -2553,38 +2553,17 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
# Check if we are using Apple cc
# FIXME: It would be nicer if there was a better way to test this.
#--------------------------------------------------------------------
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -faltivec"
echo "$as_me:$LINENO: checking if we are using the apple compiler" >&5
echo $ECHO_N "checking if we are using the apple compiler... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
int main() {return 0;}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cc_type=apple
gcc_cc_type=`${CC} --print-libgcc-file-name | grep -c "gcc-lib"`
if test "$gcc_cc_type" = 1; then
cc_type=gnu
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cc_type=gnu
cc_type=apple
fi
rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $cc_type" >&5
echo "${ECHO_T}$cc_type" >&6
CFLAGS="$save_CFLAGS"
#--------------------------------------------------------------------
# specific target_os options
@ -3368,6 +3347,7 @@ export LD_LIBRARY_PATH
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`

10
configure.ac
View file

@ -64,13 +64,15 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
# Check if we are using Apple cc
# FIXME: It would be nicer if there was a better way to test this.
#--------------------------------------------------------------------
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -faltivec"
AC_MSG_CHECKING([if we are using the apple compiler])
AC_COMPILE_IFELSE([[int main() {return 0;}]], cc_type=apple, cc_type=gnu)
gcc_cc_type=`${CC} --print-libgcc-file-name | grep -c "gcc-lib"`
if test "$gcc_cc_type" = 1; then
cc_type=gnu
else
cc_type=apple
fi
AC_MSG_RESULT($cc_type)
AC_SUBST(cc_type)
CFLAGS="$save_CFLAGS"
#--------------------------------------------------------------------
# specific target_os options