X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fm4%2Fensc_dietlibc.m4;h=0481eb8fe2397da49162c2bb67de426e39425c22;hb=ad8bbbc806a25d166b211b211af6465fc424353e;hp=fecf30eabdc9486c093e663275887e4072d83311;hpb=7777c168a29d88383075ec6d13263466d2083256;p=util-vserver.git diff --git a/util-vserver/m4/ensc_dietlibc.m4 b/util-vserver/m4/ensc_dietlibc.m4 index fecf30e..0481eb8 100644 --- a/util-vserver/m4/ensc_dietlibc.m4 +++ b/util-vserver/m4/ensc_dietlibc.m4 @@ -15,7 +15,43 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl Usage: ENSC_ENABLE_DIETLIBC() +AC_DEFUN([_ENSC_DIETLIBC_C99], +[ + AH_TEMPLATE([ENSC_DIETLIBC_C99], [Define to 1 if dietlibc supports C99]) + + AC_CACHE_CHECK([whether dietlibc supports C99], [ensc_cv_c_dietlibc_c99], + [ + _ensc_dietlibc_c99_old_CFLAGS=$CFLAGS + _ensc_dietlibc_c99_old_CC=$CC + + CFLAGS="-std=c99" + CC="${DIET:-diet} $CC" + + AC_LANG_PUSH(C) + AC_COMPILE_IFELSE([/* */],[ + AC_COMPILE_IFELSE([ + #include + #include + #if defined(inline) + # error 'inline' badly defined + #endif + volatile uint64_t a; + ], + [ensc_cv_c_dietlibc_c99=yes], + [ensc_cv_c_dietlibc_c99=no])], + [ensc_cv_c_dietlibc_c99='skipped (compiler does not support C99)']) + AC_LANG_POP + + CC=$_ensc_dietlibc_c99_old_CC + CFLAGS=$_ensc_dietlibc_c99_old_CFLAGS + ]) + + if test x"$ensc_cv_c_dietlibc_c99" = xyes; then + AC_DEFINE(ENSC_DIETLIBC_C99,1) + fi +]) + +dnl Usage: ENSC_ENABLE_DIETLIBC([,]) dnl ... automake-conditional which will be set when dnl dietlibc shall be enabled @@ -33,19 +69,41 @@ AC_DEFUN([ENSC_ENABLE_DIETLIBC], [: ${DIET:=diet} which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no]) + if test "$use_dietlibc" = detected -a '$2'; then + _dietlibc_ver=$(${DIET:-diet} -v 2>&1 | sed '1p;d') + _dietlibc_ver=${_dietlibc_ver##*dietlibc-} + _dietlibc_ver_maj=${_dietlibc_ver%%.*} + _dietlibc_ver_min=${_dietlibc_ver##*.} + _dietlibc_cmp=$2 + _dietlibc_cmp_maj=${_dietlibc_cmp%%.*} + _dietlibc_cmp_min=${_dietlibc_cmp##*.} + + let _dietlibc_ver=_dietlibc_ver_maj*1000+_dietlibc_ver_min 2>/dev/null || _dietlibc_ver=0 + let _dietlibc_cmp=_dietlibc_cmp_maj*1000+_dietlibc_cmp_min + + test $_dietlibc_ver -ge $_dietlibc_cmp || use_dietlibc=detected_old + fi + + ensc_have_dietlibc=no case x"$use_dietlibc" in xdetected) AM_CONDITIONAL($1, true) AC_MSG_RESULT([yes (autodetected)]) + ensc_have_dietlibc=yes ;; xforced) AM_CONDITIONAL($1, true) AC_MSG_RESULT([yes (forced)]) + ensc_have_dietlibc=yes ;; xdetected_no) AM_CONDITIONAL($1, false) AC_MSG_RESULT([no (detected)]) ;; + xdetected_old) + AM_CONDITIONAL($1, false) + AC_MSG_RESULT([no (too old; $2+ required)]) + ;; xforced_no) AM_CONDITIONAL($1, false) AC_MSG_RESULT([no (forced)]) @@ -54,4 +112,8 @@ AC_DEFUN([ENSC_ENABLE_DIETLIBC], AC_MSG_ERROR([internal error, use_dietlibc was "$use_dietlibc"]) ;; esac + + if test x"$ensc_have_dietlibc" != xno; then + _ENSC_DIETLIBC_C99 + fi ])