mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 14:30:32 +00:00
Do not specify the -ansi switch for gcc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1048 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
4148a92445
commit
e3dfa5b144
15
ChangeLog
15
ChangeLog
@ -1,3 +1,15 @@
|
||||
2000-09-26 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* src/frontends/kde/Makefile.am: fix rule for
|
||||
formindexdialogdata_moc.C
|
||||
|
||||
* src/.cvsignore: add ext_l10n.h to ignore
|
||||
|
||||
* acconfig.h: stop messing with __STRICT_ANSI__
|
||||
* config/gnome.m4: remove option to set -ansi
|
||||
* config/kde.m4: remove option to set -ansi
|
||||
* config/lyxinclude.m4: don't set -ansi
|
||||
|
||||
2000-09-27 Juergen Vigna <jug@sad.it>
|
||||
|
||||
* various files: remove "default" language check.
|
||||
@ -364,7 +376,6 @@
|
||||
|
||||
* src/frontends/kde/FormRef.h: removed trailing comma from enums.
|
||||
|
||||
|
||||
2000-09-19 Marko Vendelin <markov@ioc.ee>
|
||||
|
||||
* src/frontends/gnome/Menubar_pimpl.C
|
||||
@ -390,8 +401,6 @@
|
||||
* src/frontends/gnome/FormCitation.h: rewrite to use main window
|
||||
action area. Only "Insert new citation" is implemented.
|
||||
|
||||
|
||||
|
||||
2000-09-19 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/buffer.C (Dispatch): fix call to Dispatch
|
||||
|
||||
@ -49,12 +49,6 @@
|
||||
/************************************************************
|
||||
** You should not need to change anything beyond this point */
|
||||
|
||||
/* even though -ansi might have been specified for gcc, we want all
|
||||
usual prototypes. */
|
||||
#ifdef __STRICT_ANSI__
|
||||
/**/#undef __STRICT_ANSI__
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRCHR
|
||||
#define strchr(a,b) index(a,b)
|
||||
#endif
|
||||
|
||||
@ -43,31 +43,6 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
|
||||
fi
|
||||
AC_MSG_RESULT($warnCFLAGS)
|
||||
|
||||
AC_ARG_ENABLE(iso-c,
|
||||
[ --enable-iso-c Try to warn if code is not ISO C ],,
|
||||
enable_iso_c=no)
|
||||
|
||||
AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
|
||||
complCFLAGS=
|
||||
if test "x$enable_iso_c" != "xno"; then
|
||||
if test "x$GCC" = "xyes"; then
|
||||
case " $CFLAGS " in
|
||||
*[\ \ ]-ansi[\ \ ]*) ;;
|
||||
*) complCFLAGS="$complCFLAGS -ansi" ;;
|
||||
esac
|
||||
|
||||
case " $CFLAGS " in
|
||||
*[\ \ ]-pedantic[\ \ ]*) ;;
|
||||
*) complCFLAGS="$complCFLAGS -pedantic" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($complCFLAGS)
|
||||
if test "x$cflags_set" != "xyes"; then
|
||||
CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
|
||||
cflags_set=yes
|
||||
AC_SUBST(cflags_set)
|
||||
fi
|
||||
])
|
||||
|
||||
dnl For C++, do basically the same thing.
|
||||
@ -97,31 +72,6 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
|
||||
fi
|
||||
AC_MSG_RESULT($warnCXXFLAGS)
|
||||
|
||||
AC_ARG_ENABLE(iso-cxx,
|
||||
[ --enable-iso-cxx Try to warn if code is not ISO C++ ],,
|
||||
enable_iso_cxx=no)
|
||||
|
||||
AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
|
||||
complCXXFLAGS=
|
||||
if test "x$enable_iso_cxx" != "xno"; then
|
||||
if test "x$GCC" = "xyes"; then
|
||||
case " $CXXFLAGS " in
|
||||
*[\ \ ]-ansi[\ \ ]*) ;;
|
||||
*) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
|
||||
esac
|
||||
|
||||
case " $CXXFLAGS " in
|
||||
*[\ \ ]-pedantic[\ \ ]*) ;;
|
||||
*) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($complCXXFLAGS)
|
||||
if test "x$cxxflags_set" != "xyes"; then
|
||||
CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
|
||||
cxxflags_set=yes
|
||||
AC_SUBST(cxxflags_set)
|
||||
fi
|
||||
])
|
||||
dnl Curses detection: Munged from Midnight Commander's configure.in
|
||||
dnl
|
||||
|
||||
178
config/kde.m4
178
config/kde.m4
@ -1191,184 +1191,6 @@ if test "$ac_cv_gnu_extensions" = "yes"; then
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_CHECK_COMPILERS,
|
||||
[
|
||||
dnl this is somehow a fat lie, but prevents other macros from double checking
|
||||
AC_PROVIDE([AC_PROG_CC])
|
||||
AC_PROVIDE([AC_PROG_CPP])
|
||||
AC_ARG_ENABLE(debug,[ --enable-debug creates debugging code [default=no]],
|
||||
[
|
||||
if test $enableval = "no"; dnl
|
||||
then ac_use_debug_code="no"
|
||||
else ac_use_debug_code="yes"
|
||||
fi
|
||||
], [ac_use_debug_code="no"])
|
||||
|
||||
AC_ARG_ENABLE(strict,[ --enable-strict compiles with strict compiler options (may not work!)],
|
||||
[
|
||||
if test $enableval = "no"; then
|
||||
ac_use_strict_options="no"
|
||||
else
|
||||
ac_use_strict_options="yes"
|
||||
fi
|
||||
], [ac_use_strict_options="no"])
|
||||
|
||||
dnl this was AC_PROG_CC. I had to include it manualy, since I had to patch it
|
||||
AC_MSG_CHECKING(for a C-Compiler)
|
||||
dnl if there is one, print out. if not, don't matter
|
||||
AC_MSG_RESULT($CC)
|
||||
|
||||
if test -z "$CC"; then AC_CHECK_PROG(CC, gcc, gcc) fi
|
||||
if test -z "$CC"; then AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) fi
|
||||
if test -z "$CC"; then AC_CHECK_PROG(CC, xlc, xlc) fi
|
||||
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
|
||||
|
||||
AC_PROG_CC_WORKS
|
||||
AC_PROG_CC_GNU
|
||||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
GCC=yes
|
||||
else
|
||||
GCC=
|
||||
fi
|
||||
|
||||
if test -z "$CFLAGS"; then
|
||||
if test "$ac_use_debug_code" = "yes"; then
|
||||
AC_PROG_CC_G
|
||||
if test $ac_cv_prog_cc_g = yes; then
|
||||
CFLAGS="-g"
|
||||
fi
|
||||
else
|
||||
if test "$GCC" = "yes"; then
|
||||
CFLAGS="-O2"
|
||||
else
|
||||
CFLAGS=""
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
CFLAGS="$CFLAGS -Wall"
|
||||
|
||||
if test "$ac_use_strict_options" = "yes"; then
|
||||
CFLAGS="$CFLAGS -W -ansi -pedantic"
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
case "$host" in
|
||||
*-*-sysv4.2uw*) CFLAGS="$CFLAGS -D_UNIXWARE";;
|
||||
esac
|
||||
|
||||
if test -z "$LDFLAGS" && test "$ac_use_debug_code" = "no" && test "$GCC" = "yes"; then
|
||||
LDFLAGS="-s"
|
||||
fi
|
||||
|
||||
|
||||
dnl this is AC_PROG_CPP. I had to include it here, since autoconf checks
|
||||
dnl dependecies between AC_PROG_CPP and AC_PROG_CC (or is it automake?)
|
||||
|
||||
AC_MSG_CHECKING(how to run the C preprocessor)
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
fi
|
||||
if test -z "$CPP"; then
|
||||
AC_CACHE_VAL(ac_cv_prog_CPP,
|
||||
[ # This must be in double quotes, not single quotes, because CPP may get
|
||||
# substituted into the Makefile and "${CC-cc}" will confuse make.
|
||||
CPP="${CC-cc} -E"
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
dnl Use a header file that comes with gcc, so configuring glibc
|
||||
dnl with a fresh cross-compiler works.
|
||||
AC_TRY_CPP([#include <assert.h>
|
||||
Syntax Error], ,
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
AC_TRY_CPP([#include <assert.h>
|
||||
Syntax Error], , CPP=/lib/cpp))
|
||||
ac_cv_prog_CPP="$CPP"])dnl
|
||||
CPP="$ac_cv_prog_CPP"
|
||||
else
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
AC_MSG_RESULT($CPP)
|
||||
AC_SUBST(CPP)dnl
|
||||
|
||||
|
||||
AC_MSG_CHECKING(for a C++-Compiler)
|
||||
dnl if there is one, print out. if not, don't matter
|
||||
AC_MSG_RESULT($CXX)
|
||||
|
||||
if test -z "$CXX"; then AC_CHECK_PROG(CXX, g++, g++) fi
|
||||
if test -z "$CXX"; then AC_CHECK_PROG(CXX, CC, CC) fi
|
||||
if test -z "$CXX"; then AC_CHECK_PROG(CXX, xlC, xlC) fi
|
||||
if test -z "$CXX"; then AC_CHECK_PROG(CXX, DCC, DCC) fi
|
||||
test -z "$CXX" && AC_MSG_ERROR([no acceptable C++-compiler found in \$PATH])
|
||||
|
||||
AC_PROG_CXX_WORKS
|
||||
AC_PROG_CXX_GNU
|
||||
|
||||
if test $ac_cv_prog_gxx = yes; then
|
||||
GXX=yes
|
||||
else
|
||||
AC_MSG_CHECKING(whether we are using SPARC CC)
|
||||
GXX=
|
||||
cat > conftest.C << EOF
|
||||
#ifdef __SUNPRO_CC
|
||||
yes;
|
||||
#endif
|
||||
EOF
|
||||
|
||||
ac_try="$CXX -E conftest.C"
|
||||
if { (eval echo configure:__online__: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_CC=yes
|
||||
else
|
||||
ac_cv_prog_CC=no
|
||||
fi
|
||||
AC_MSG_RESULT($ac_cv_prog_CC)
|
||||
fi
|
||||
|
||||
if test -z "$CXXFLAGS"; then
|
||||
if test "$ac_use_debug_code" = "yes"; then
|
||||
AC_PROG_CXX_G
|
||||
if test $ac_cv_prog_cxx_g = yes; then
|
||||
CXXFLAGS="-g"
|
||||
fi
|
||||
if test "$ac_cv_prog_CC" = "yes"; then
|
||||
CXXFLAGS="$CXXFLAGS -pto"
|
||||
fi
|
||||
else
|
||||
if test "$GXX" = "yes"; then
|
||||
CXXFLAGS="-O2"
|
||||
else
|
||||
if test "$ac_cv_prog_CC" = "yes"; then
|
||||
CXXFLAGS="-pto -O2"
|
||||
else
|
||||
CXXFLAGS=""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$GXX" = "yes"; then
|
||||
CXXFLAGS="$CXXFLAGS -Wall"
|
||||
|
||||
if test "$ac_use_strict_options" = "yes"; then
|
||||
CXXFLAGS="$CXXFLAGS -W -ansi -Wtraditional -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Woverloaded-virtual -Wbad-function-cast -Wsynth"
|
||||
fi
|
||||
|
||||
if test "$kde_very_strict" = "yes"; then
|
||||
CXXFLAGS="$CXXFLAGS -Wold-style-cast -Wshadow -Wredundant-decls -Wconversion"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
case "$host" in
|
||||
*-*-sysv4.2uw*) CXXFLAGS="$CXXFLAGS -D_UNIXWARE";;
|
||||
esac
|
||||
|
||||
])
|
||||
|
||||
dnl just a wrapper to clean up configure.in
|
||||
AC_DEFUN(KDE_PROG_LIBTOOL,
|
||||
[
|
||||
|
||||
@ -197,7 +197,7 @@ dnl Check the version of g++
|
||||
case $gxx_version in
|
||||
2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
|
||||
2.96*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
|
||||
*) CXXFLAGS="$CXXFLAGS -ansi -W -Wall -Wno-return-type";;
|
||||
*) CXXFLAGS="$CXXFLAGS -W -Wall -Wno-return-type";;
|
||||
esac
|
||||
if test $lyx_devel_version = yes ; then
|
||||
case $gxx_version in
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
ext_l10n.h
|
||||
config.h
|
||||
lyx
|
||||
Makefile
|
||||
|
||||
@ -171,6 +171,7 @@ _("Version...|V");
|
||||
_("");
|
||||
_("A&A");
|
||||
_("ACT");
|
||||
_("AMS");
|
||||
_("AT_RISE:");
|
||||
_("Abstract");
|
||||
_("Accepted");
|
||||
|
||||
@ -110,6 +110,8 @@ formurldialog_moc.C: formurldialog.h
|
||||
formindexdialog.C: formindexdialog_moc.C
|
||||
formindexdialog_moc.C: formindexdialog.h
|
||||
$(MOC) formindexdialog.h -o formindexdialog_moc.C
|
||||
formindexdialogdata_moc.C: formindexdialogdata.h
|
||||
$(MOC) formindexdialogdata.h -o formindexdialogdata_moc.C
|
||||
|
||||
formcitationdialog.C: formcitationdialog_moc.C
|
||||
formcitationdialog_moc.C: formcitationdialog.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user