From: Michael Poole Date: Thu, 7 Apr 2005 00:03:38 +0000 (+0000) Subject: Remove unet_PIPE_CFLAGS macro. X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=6713027b47a4b8dbcc39e8c95b068d386c45c0cf Remove unet_PIPE_CFLAGS macro. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1353 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- diff --git a/ChangeLog b/ChangeLog index 56f5aa8..9150c0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-04-06 Michael Poole + + * acinclude.m4 (unet_PIPE_CFLAGS): Remove; -pipe is obsolete in + current gcc releases and is slower than files for previous + releases on most OSes. + + * configure.in (AC_PREREQ): Bump to 2.59 because of AS_HELP_STRING. + (unet_PIPE_CFLAGS): Remove use of macro. + + * aclocal.m4: Regenerate. + + * configure: Likewise. + 2005-04-04 Michael Poole * configure.in: For developers' ease, allow passing an option to diff --git a/acinclude.m4 b/acinclude.m4 index 5a6440e..3868531 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,27 +1,3 @@ -dnl -dnl Macro: unet_PIPE_CFLAGS -dnl -dnl If the compiler understands -pipe, add it to CFLAGS if not already -dnl there. -dnl -AC_DEFUN(unet_PIPE_CFLAGS, -[AC_MSG_CHECKING([if the compiler understands -pipe]) -unet_cv_pipe_flags="$ac_cv_prog_gcc" -if test "$ac_cv_prog_gcc" = no; then - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -pipe" - AC_TRY_COMPILE(,,unet_cv_pipe_flags=yes,) - CFLAGS="$OLDCFLAGS" -fi -AC_MSG_RESULT($unet_cv_pipe_flags) -if test "$unet_cv_pipe_flags" = yes ; then - x=`echo $CFLAGS | grep 'pipe' 2>/dev/null` - if test "$x" = "" ; then - CFLAGS="$CFLAGS -pipe" - fi -fi -]) - dnl dnl Macro: unet_NONBLOCKING dnl diff --git a/configure.in b/configure.in index eaefd8c..7329163 100644 --- a/configure.in +++ b/configure.in @@ -41,8 +41,8 @@ ac_default_prefix=$unet_cv_prefix dnl Define the input and output configuration header file. AC_CONFIG_HEADER([config.h]) -dnl Demand at least version 2.50 of autoconf -AC_PREREQ(2.50) +dnl Demand at least version 2.59 of autoconf (for AS_HELP_STRING) +AC_PREREQ(2.59) dnl Find out what type of system we are AC_CANONICAL_HOST @@ -64,10 +64,6 @@ fi if test x"$CFLAGS" != x; then CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/$unet_cv_optimization/` fi -dnl Remove -pipe during configure -if test x"$CFLAGS" != x; then - CFLAGS=`echo "$CFLAGS" | sed -e 's/-pipe//g'` -fi dnl Notice the -g flag and deal accordingly if test x"$CFLAGS" != x; then unet_old_cflags=$CFLAGS @@ -180,13 +176,9 @@ dnl byacc does not seem to have any way to test for workingness, so only warn. AC_MSG_WARN([$YACC may not work as yacc.]) fi - unet_NONBLOCKING unet_SIGNALS -dnl Add -pipe when possible -unet_PIPE_CFLAGS - dnl Check OS for os_dep files. AC_MSG_CHECKING(for OS-dependent information) case "$host" in