diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-15 10:54:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:45 -0500 |
| commit | a8fd66f91fcb16dd56890f918e47443f2aba3a98 (patch) | |
| tree | 9b922615f6905a117be80624de56a769d6beb521 | |
| parent | f8079a63863ab1dfb604ec4c2e3cd6a50bb01e23 (diff) | |
| download | samba-a8fd66f91fcb16dd56890f918e47443f2aba3a98.tar.gz samba-a8fd66f91fcb16dd56890f918e47443f2aba3a98.tar.bz2 samba-a8fd66f91fcb16dd56890f918e47443f2aba3a98.zip | |
r18549: move gcc version check to libreplace and reorder the tests a bit
for nicer output
metze
(This used to be commit 888a769af557d050d99df703ce5f651688c837c5)
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 6 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace_cc.m4 | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index a1dfc45404..2425d3da4b 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -7,12 +7,6 @@ dnl AC_LIBREPLACE_CC_CHECKS -if test x"$GCC" = x"yes" ; then - AC_MSG_CHECKING([for version of gcc]) - GCC_VERSION=`$CC -dumpversion` - AC_MSG_RESULT(${GCC_VERSION}) -fi - # # Set the debug symbol option if we have # --enable-*developer or --enable-debug diff --git a/source4/lib/replace/libreplace_cc.m4 b/source4/lib/replace/libreplace_cc.m4 index 4f2ce034bf..aa0465983a 100644 --- a/source4/lib/replace/libreplace_cc.m4 +++ b/source4/lib/replace/libreplace_cc.m4 @@ -28,19 +28,23 @@ ac_cv_prog_cc_Ae=no savedCFLAGS=$CFLAGS AC_PROG_CC CFLAGS=$savedCFLAGS -AC_ISC_POSIX -AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC_C99 -AC_C_INLINE +if test x"$GCC" = x"yes" ; then + AC_MSG_CHECKING([for version of gcc]) + GCC_VERSION=`$CC -dumpversion` + AC_MSG_RESULT(${GCC_VERSION}) +fi +AC_USE_SYSTEM_EXTENSIONS AC_C_BIGENDIAN -AC_PROG_INSTALL +AC_C_INLINE +LIBREPLACE_C99_STRUCT_INIT([],[AC_MSG_WARN([c99 structure initializer are not supported])]) +AC_PROG_INSTALL +AC_ISC_POSIX AC_EXTENSION_FLAG(_XOPEN_SOURCE_EXTENDED) AC_EXTENSION_FLAG(_OSF_SOURCE) -LIBREPLACE_C99_STRUCT_INIT([],[AC_MSG_WARN([c99 structure initializer are not supported])]) - AC_SYS_LARGEFILE dnl Add #include for broken IRIX header files |