* autoconf.sh: Formatting changes.
Removed development junk.
* acspecific.m4: Formatting changes.
* autoconf.m4: Likewise.
* autoheader.m4: Likewise.
+1999-11-10 Akim Demaille <akim@epita.fr>
+
+ * autoconf.sh: Formatting changes.
+ Removed development junk.
+ * acspecific.m4: Formatting changes.
+ * autoconf.m4: Likewise.
+ * autoheader.m4: Likewise.
+
1999-11-10 Akim Demaille <akim@epita.fr>
Let Autoconf use autoconf's `--install'.
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.
-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 <<EOF
dnl Internal use only.
AC_DEFUN(AC_PROG_ECHO_N,
[if (echo "testing\c"; echo 1,2,3) | grep c >/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=' '
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
])])
+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],
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
# 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"
# 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.
## -------------- ##
# 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.
# 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.
## -------------- ##
# 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.
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
# 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.
## -------------- ##
# 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.
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.
-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 <<EOF
dnl Internal use only.
AC_DEFUN(AC_PROG_ECHO_N,
[if (echo "testing\c"; echo 1,2,3) | grep c >/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=' '
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
])])
+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],
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
# 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"