From: Andre Noll Date: Thu, 29 Aug 2013 19:09:18 +0000 (+0000) Subject: build: Remove check for buggy snprintf(). X-Git-Tag: v0.5.1~1^2~67 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=9fc99cdc6b696cc12d02a431a928ec2891e825d7;p=paraslash.git build: Remove check for buggy snprintf(). This check has not found any problematic snprintf() so far. But more importantly, it uses AC_RUN_IFELSE() which should be avoided since it can not work for cross-compile setups. Remove the check. --- diff --git a/configure.ac b/configure.ac index ec346059..ff32efe3 100644 --- a/configure.ac +++ b/configure.ac @@ -199,87 +199,6 @@ play_errlist_objs="play fd sched ggo buffer_tree time string net " play_cmdline_objs="add_cmdline(http_recv dccp_recv udp_recv afh_recv compress_filter amp_filter prebuffer_filter file_write play)" play_ldflags="-lm" -########################################################################### snprintf -# =========================================================================== -# http://www.nongnu.org/autoconf-archive/ax_func_snprintf.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_FUNC_SNPRINTF -# -# DESCRIPTION -# -# Checks for a fully C99 compliant snprintf, in particular checks whether -# it does bounds checking and returns the correct string length; does the -# same check for vsnprintf. If no working snprintf or vsnprintf is found, -# it prints an error message and aborts. -# -# LICENSE -# -# Copyright (c) 2008 Ruediger Kuhlmann -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - -AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF]) -AC_DEFUN([AX_FUNC_SNPRINTF], -[AC_CHECK_FUNCS(snprintf vsnprintf) -AC_MSG_CHECKING(for working snprintf) -AC_CACHE_VAL(ac_cv_have_working_snprintf, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include - -int main(void) -{ - char bufs[5] = { 'x', 'x', 'x', '\0', '\0' }; - char bufd[5] = { 'x', 'x', 'x', '\0', '\0' }; - int i; - i = snprintf (bufs, 2, "%s", "111"); - if (strcmp (bufs, "1")) exit (1); - if (i != 3) exit (1); - i = snprintf (bufd, 2, "%d", 111); - if (strcmp (bufd, "1")) exit (1); - if (i != 3) exit (1); - exit(0); -}]])],[ac_cv_have_working_snprintf=yes], -[ac_cv_have_working_snprintf=no],[ac_cv_have_working_snprintf=cross])]) -AC_MSG_RESULT([$ac_cv_have_working_snprintf]) -AC_MSG_CHECKING(for working vsnprintf) -AC_CACHE_VAL(ac_cv_have_working_vsnprintf, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include - -int my_vsnprintf (char *buf, const char *tmpl, ...) -{ - int i; - va_list args; - va_start (args, tmpl); - i = vsnprintf (buf, 2, tmpl, args); - va_end (args); - return i; -} - -int main(void) -{ - char bufs[5] = { 'x', 'x', 'x', '\0', '\0' }; - char bufd[5] = { 'x', 'x', 'x', '\0', '\0' }; - int i; - i = my_vsnprintf (bufs, "%s", "111"); - if (strcmp (bufs, "1")) exit (1); - if (i != 3) exit (1); - i = my_vsnprintf (bufd, "%d", 111); - if (strcmp (bufd, "1")) exit (1); - if (i != 3) exit (1); - exit(0); -}]])],[ac_cv_have_working_vsnprintf=yes], -[ac_cv_have_working_vsnprintf=no],[ac_cv_have_working_vsnprintf=cross])]) -AC_MSG_RESULT([$ac_cv_have_working_vsnprintf]) -if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then -AC_MSG_ERROR([fatal: buggy snprintf() detected]) -fi]) -AX_FUNC_SNPRINTF() ################################################################## clock_gettime clock_gettime_lib= AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [