From: Akim Demaille Date: Sat, 29 Jan 2000 11:37:48 +0000 (+0000) Subject: 1999-11-10 Akim Demaille X-Git-Tag: autoconf-2.50~1260 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddfcae90fa92afd56de1179816afb8a35d88950b;p=thirdparty%2Fautoconf.git 1999-11-10 Akim Demaille * autoconf.sh: Formatting changes. Removed development junk. * acspecific.m4: Formatting changes. * autoconf.m4: Likewise. * autoheader.m4: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 1e6e61706..c09d07e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-11-10 Akim Demaille + + * autoconf.sh: Formatting changes. + Removed development junk. + * acspecific.m4: Formatting changes. + * autoconf.m4: Likewise. + * autoheader.m4: Likewise. + 1999-11-10 Akim Demaille Let Autoconf use autoconf's `--install'. diff --git a/acgeneral.m4 b/acgeneral.m4 index 57924d37f..8dfff4112 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -1912,8 +1912,8 @@ AC_MSG_RESULT_UNQUOTED(AC_VAR_GET([$2]))]) dnl ### Defining symbols -dnl AC_DEFINE(VARIABLE [, VALUE[, DESCRIPTION]]) -dnl -------------------------------------------- +dnl AC_DEFINE(VARIABLE, [VALUE], [DESCRIPTION]) +dnl ------------------------------------------- dnl Set VARIABLE to VALUE, verbatim, or 1. Remember the value dnl and if VARIABLE is affected the same VALUE, do nothing, else dnl die. The third argument is used by autoheader. @@ -1925,8 +1925,8 @@ EOF -dnl AC_DEFINE_UNQUOTED(VARIABLE [, VALUE[, DESCRIPTION]]) -dnl ----------------------------------------------------- +dnl AC_DEFINE_UNQUOTED(VARIABLE, [VALUE], [DESCRIPTION]) +dnl ---------------------------------------------------- dnl Similar, but perform shell substitutions $ ` \ once on VALUE. define(AC_DEFINE_UNQUOTED, [cat >>confdefs.h </dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then ac_n= ac_c=' ' ac_t=' ' @@ -2702,8 +2702,6 @@ dnl . However, nearly all of this macro dnl came from the "OCTAVE_FLIBS" macro in "octave-2.0.13/aclocal.m4", dnl and full credit should go to John W. Eaton for writing this dnl extremely useful macro. Thank you John. -dnl -dnl AC_F77_LIBRARY_LDFLAGS() dnl We have to "pushdef" this macro for now, because I haven't checked dnl this version of the macro into the Autoconf repository yet. --MDL @@ -2957,12 +2955,12 @@ dnl We need to pop the language stack twice. ])]) +dnl AC_F77_WRAPPERS +dnl --------------- dnl Defines C macros F77_FUNC(name,NAME) and F77_FUNC_(name,NAME) to dnl properly mangle the names of C identifiers, and C identifiers with dnl underscores, respectively, so that they match the name mangling dnl scheme used by the Fortran 77 compiler. -dnl -dnl AC_F77_WRAPPERS() AC_DEFUN(AC_F77_WRAPPERS, [ AC_CACHE_CHECK([if we can define Fortran 77 name-mangling macros], @@ -3368,7 +3366,7 @@ dnl FIXME banish uname from this macro! X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says + # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) if test $ac_cv_lib_dnet_dnet_ntoa = no; then @@ -3421,7 +3419,7 @@ dnl FIXME banish uname from this macro! # we get undefined symbols. So assume we have SM if we have ICE. # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + # --interran@uluru.Stanford.EDU, Karl Berry AC_CHECK_LIB(ICE, IceConnectionNumber, [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS) LDFLAGS="$ac_save_LDFLAGS" diff --git a/autoconf.in b/autoconf.in index f87ecd0ea..b90992e29 100644 --- a/autoconf.in +++ b/autoconf.in @@ -221,16 +221,18 @@ case $task in # Put the real line numbers into configure to make config.log more helpful. # Because quoting can sometimes get really painful in m4, there are special # @tokens@ to substitute. - $AWK ' - /__oline__/ { printf "%d:", NR + 1 } - { print } - ' $tmpout | sed ' - /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ - s/@BKL@/[/g - s/@BKR@/]/g - s/@DLR@/$/g - s/@PND@/#/g - ' >&4 + cat -s $tmpout | + $AWK ' + /__oline__/ { printf "%d:", NR + 1 } + { print } + ' | + sed ' + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + s/@BKL@/[/g + s/@BKR@/]/g + s/@DLR@/$/g + s/@PND@/#/g + ' >&4 ;; # End of the task script. ## -------------- ## @@ -288,8 +290,6 @@ EOF # Run m4 with all the library files, save its report on strderr. $verbose Running $run_m4 -dipa -t m4_include -t m4_sinclude $tmpin $localdir/*.m4 $AC_ACLOCALDIR/*.m4 $infile $run_m4 -dipa -t m4_include -t m4_sinclude $tmpin $localdir/*.m4 $AC_ACLOCALDIR/*.m4 $infile >the-script 2>$tmpout - cp $tmpout LOG - cp $tmpin tmpin # Keep only the good lines, there may be other outputs grep '^[^: ]*:[0-9][0-9]*:[^:]*$' $tmpout >$tmpin # Extract the files that are not in the local dir, and install the links. diff --git a/autoconf.sh b/autoconf.sh index f87ecd0ea..b90992e29 100644 --- a/autoconf.sh +++ b/autoconf.sh @@ -221,16 +221,18 @@ case $task in # Put the real line numbers into configure to make config.log more helpful. # Because quoting can sometimes get really painful in m4, there are special # @tokens@ to substitute. - $AWK ' - /__oline__/ { printf "%d:", NR + 1 } - { print } - ' $tmpout | sed ' - /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ - s/@BKL@/[/g - s/@BKR@/]/g - s/@DLR@/$/g - s/@PND@/#/g - ' >&4 + cat -s $tmpout | + $AWK ' + /__oline__/ { printf "%d:", NR + 1 } + { print } + ' | + sed ' + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + s/@BKL@/[/g + s/@BKR@/]/g + s/@DLR@/$/g + s/@PND@/#/g + ' >&4 ;; # End of the task script. ## -------------- ## @@ -288,8 +290,6 @@ EOF # Run m4 with all the library files, save its report on strderr. $verbose Running $run_m4 -dipa -t m4_include -t m4_sinclude $tmpin $localdir/*.m4 $AC_ACLOCALDIR/*.m4 $infile $run_m4 -dipa -t m4_include -t m4_sinclude $tmpin $localdir/*.m4 $AC_ACLOCALDIR/*.m4 $infile >the-script 2>$tmpout - cp $tmpout LOG - cp $tmpin tmpin # Keep only the good lines, there may be other outputs grep '^[^: ]*:[0-9][0-9]*:[^:]*$' $tmpout >$tmpin # Extract the files that are not in the local dir, and install the links. diff --git a/autoheader.m4 b/autoheader.m4 index 4f38bfd31..0712045e1 100644 --- a/autoheader.m4 +++ b/autoheader.m4 @@ -31,8 +31,8 @@ dnl each definition seems to be necessary to prevent m4 from eating dnl the newline, which makes the @@@ not always be at the beginning of dnl a line. -dnl AH_DEFINE(VARIABLE [, VALUE[, DESCRIPTION]]) -dnl -------------------------------------------- +dnl AH_DEFINE(VARIABLE, [VALUE], [DESCRIPTION]) +dnl ------------------------------------------- dnl When running autoheader, this macro replaces AC_DEFINE and dnl AC_DEFINE_UNQUOTED. dnl diff --git a/bin/autoconf.in b/bin/autoconf.in index f87ecd0ea..b90992e29 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -221,16 +221,18 @@ case $task in # Put the real line numbers into configure to make config.log more helpful. # Because quoting can sometimes get really painful in m4, there are special # @tokens@ to substitute. - $AWK ' - /__oline__/ { printf "%d:", NR + 1 } - { print } - ' $tmpout | sed ' - /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ - s/@BKL@/[/g - s/@BKR@/]/g - s/@DLR@/$/g - s/@PND@/#/g - ' >&4 + cat -s $tmpout | + $AWK ' + /__oline__/ { printf "%d:", NR + 1 } + { print } + ' | + sed ' + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + s/@BKL@/[/g + s/@BKR@/]/g + s/@DLR@/$/g + s/@PND@/#/g + ' >&4 ;; # End of the task script. ## -------------- ## @@ -288,8 +290,6 @@ EOF # Run m4 with all the library files, save its report on strderr. $verbose Running $run_m4 -dipa -t m4_include -t m4_sinclude $tmpin $localdir/*.m4 $AC_ACLOCALDIR/*.m4 $infile $run_m4 -dipa -t m4_include -t m4_sinclude $tmpin $localdir/*.m4 $AC_ACLOCALDIR/*.m4 $infile >the-script 2>$tmpout - cp $tmpout LOG - cp $tmpin tmpin # Keep only the good lines, there may be other outputs grep '^[^: ]*:[0-9][0-9]*:[^:]*$' $tmpout >$tmpin # Extract the files that are not in the local dir, and install the links. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 57924d37f..8dfff4112 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1912,8 +1912,8 @@ AC_MSG_RESULT_UNQUOTED(AC_VAR_GET([$2]))]) dnl ### Defining symbols -dnl AC_DEFINE(VARIABLE [, VALUE[, DESCRIPTION]]) -dnl -------------------------------------------- +dnl AC_DEFINE(VARIABLE, [VALUE], [DESCRIPTION]) +dnl ------------------------------------------- dnl Set VARIABLE to VALUE, verbatim, or 1. Remember the value dnl and if VARIABLE is affected the same VALUE, do nothing, else dnl die. The third argument is used by autoheader. @@ -1925,8 +1925,8 @@ EOF -dnl AC_DEFINE_UNQUOTED(VARIABLE [, VALUE[, DESCRIPTION]]) -dnl ----------------------------------------------------- +dnl AC_DEFINE_UNQUOTED(VARIABLE, [VALUE], [DESCRIPTION]) +dnl ---------------------------------------------------- dnl Similar, but perform shell substitutions $ ` \ once on VALUE. define(AC_DEFINE_UNQUOTED, [cat >>confdefs.h </dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then ac_n= ac_c=' ' ac_t=' ' @@ -2702,8 +2702,6 @@ dnl . However, nearly all of this macro dnl came from the "OCTAVE_FLIBS" macro in "octave-2.0.13/aclocal.m4", dnl and full credit should go to John W. Eaton for writing this dnl extremely useful macro. Thank you John. -dnl -dnl AC_F77_LIBRARY_LDFLAGS() dnl We have to "pushdef" this macro for now, because I haven't checked dnl this version of the macro into the Autoconf repository yet. --MDL @@ -2957,12 +2955,12 @@ dnl We need to pop the language stack twice. ])]) +dnl AC_F77_WRAPPERS +dnl --------------- dnl Defines C macros F77_FUNC(name,NAME) and F77_FUNC_(name,NAME) to dnl properly mangle the names of C identifiers, and C identifiers with dnl underscores, respectively, so that they match the name mangling dnl scheme used by the Fortran 77 compiler. -dnl -dnl AC_F77_WRAPPERS() AC_DEFUN(AC_F77_WRAPPERS, [ AC_CACHE_CHECK([if we can define Fortran 77 name-mangling macros], @@ -3368,7 +3366,7 @@ dnl FIXME banish uname from this macro! X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says + # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) if test $ac_cv_lib_dnet_dnet_ntoa = no; then @@ -3421,7 +3419,7 @@ dnl FIXME banish uname from this macro! # we get undefined symbols. So assume we have SM if we have ICE. # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + # --interran@uluru.Stanford.EDU, Karl Berry AC_CHECK_LIB(ICE, IceConnectionNumber, [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS) LDFLAGS="$ac_save_LDFLAGS"