X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fm4%2Fensc_dietlibc.m4;h=9a55c51bf3406894e863b4bd991b058d8c2beb79;hb=b38fd3ee74604c158da45b6c5cf2e2e477ae8121;hp=781efbf268c2498970569d359d586b3f9870abd9;hpb=f0cb878331965c143ef4a9448d4c577c4d1dcfb5;p=util-vserver.git diff --git a/util-vserver/m4/ensc_dietlibc.m4 b/util-vserver/m4/ensc_dietlibc.m4 index 781efbf..9a55c51 100644 --- a/util-vserver/m4/ensc_dietlibc.m4 +++ b/util-vserver/m4/ensc_dietlibc.m4 @@ -15,37 +15,114 @@ 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 +dnl provides: +dnl * $ENSC_VERSION_DIETLIBC_NUM and +dnl * $ENSC_VERSION_DIETLIBC -AC_DEFUN(ENSC_ENABLE_DIETLIBC, +AC_DEFUN([ENSC_ENABLE_DIETLIBC], [ AC_MSG_CHECKING([whether to enable dietlibc]) + + AC_ARG_VAR(DIET, [The 'diet' wrapper (default: diet)]) + AC_ARG_VAR(DIETFLAGS, [Flags passed to the 'diet' wrapper (default: -O)]) + + : ${DIET:=diet} + : ${DIETFLAGS=-Os} + AC_ARG_ENABLE([dietlibc], - [AC_HELP_STRING([--disable-dietlibc], - [do not use dietlibc (default: use dietlibc)])], + [AS_HELP_STRING([--disable-dietlibc], + [do not use dietlibc resp. enforce its usage + (with --enable-dietlibc) (default: autodetect dietlibc)])], [case "$enableval" in - yes) use_dietlibc=forced;; - no) use_dietlibc=forced_no;; - *) AC_MSG_ERROR(['$enableval' is not a valid value for --enable-dietlibc]);; + (yes) use_dietlibc=forced;; + (no) use_dietlibc=forced_no;; + (*) AC_MSG_ERROR(['$enableval' is not a valid value for --enable-dietlibc]);; esac], - [: ${DIET:=diet} - which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no]) + [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 -v 2>&1 | sed '1p;d') + _dietlibc_ver=${_dietlibc_ver##*diet version } + _dietlibc_ver=${_dietlibc_ver##*dietlibc-} + _dietlibc_ver_maj=${_dietlibc_ver%%.*} + _dietlibc_ver_min=${_dietlibc_ver##*.} + _dietlibc_ver_min=${_dietlibc_ver_min%%[[!0-9]]*} + _dietlibc_cmp="$2" + _dietlibc_cmp_maj=${_dietlibc_cmp%%.*} + _dietlibc_cmp_min=${_dietlibc_cmp##*.} + + ENSC_VERSION_DIETLIBC=$_dietlibc_ver_maj.$_dietlibc_ver_min + + 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 + else + ENSC_VERSION_DIETLIBC= + _dietlibc_ver=-1 + fi + + ENSC_VERSION_DIETLIBC_NUM=$_dietlibc_ver + ensc_have_dietlibc=no case x"$use_dietlibc" in xdetected) AM_CONDITIONAL($1, true) - AC_MSG_RESULT([yes (autodetected)]) + AC_MSG_RESULT([yes (autodetected, $ENSC_VERSION_DIETLIBC)]) + 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, $ENSC_VERSION_DIETLIBC found)]) + ;; xforced_no) AM_CONDITIONAL($1, false) AC_MSG_RESULT([no (forced)]) @@ -54,4 +131,24 @@ 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 +]) + + +dnl Usage: ENSC_DIETLIBC_SANITYCHECK +AC_DEFUN([ENSC_DIETLIBC_SANITYCHECK], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([ENSC_ENABLE_DIETLIBC]) + + if test "$host_cpu" = x86_64 -a $ENSC_VERSION_DIETLIBC_NUM -le 0027; then + AC_MSG_WARN([*** ***]) + AC_MSG_WARN([*** dietlibc<=0.27 is known to be broken for x86_64 systems ***]) + AC_MSG_WARN([*** please make sure that at least the environ.S fix is applied ***]) + AC_MSG_WARN([*** and lib/__nice.c added ***]) + AC_MSG_WARN([*** ***]) + fi ])