mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2024-11-27 01:49:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some non-srcdir build fixes.

Browse Source 
* configure.in (BUGS): Look for file in $srcdir.
* tests/Makefile.am (MACRO_FILES): Use '..', not '$(top_srcdir)'.
This commit is contained in:
Akim Demaille 2001-01-24 07:54:32 +00:00
parent 544c3a4b3d
commit cc0ba4d506
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-24 Raja R Harinath <harinath@cs.umn.edu>
Some non-srcdir build fixes.
* configure.in (BUGS): Look for file in $srcdir.
* tests/Makefile.am (MACRO_FILES): Use '..', not '$(top_srcdir)'.
2001-01-24 Akim Demaille <akim@epita.fr>
Don't AC_SUBST too much, as it makes Automake include those

13
configure vendored
View File

@ -1792,12 +1792,7 @@ s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
s,@ECHO_C@,$ECHO_C,;t t
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@CPPFLAGS@,$CPPFLAGS,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
s,@FFLAGS@,$FFLAGS,;t t
s,@DEFS@,$DEFS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
s,@LIBS@,$LIBS,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
@ -1929,7 +1924,7 @@ done; }
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:1932: creating $ac_file" >&5
{ echo "$as_me:1927: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@ -1947,7 +1942,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]* | ?:[\\/]*)
# Absolute
test -f "$f" || { { echo "$as_me:1950: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:1945: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -1960,7 +1955,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $ac_given_srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:1963: error: cannot find input file: $f" >&5
{ { echo "$as_me:1958: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -2001,5 +1996,5 @@ test "$no_create" = yes || $SHELL $CONFIG_STATUS || { (exit 1); exit 1; }
# Report the state of this version of Autoconf if this is a beta.
case 2.49c in
*[a-z]*) sed -n '/^\* Status/,$p' BUGS;;
*[a-z]*) sed -n '/^\* Status/,$p' $srcdir/BUGS;;
esac

2
configure.in
View File

@ -48,5 +48,5 @@ AC_OUTPUT(Makefile m4/Makefile man/Makefile doc/Makefile
# Report the state of this version of Autoconf if this is a beta.
case AC_PACKAGE_VERSION in
*[[a-z]]*) sed -n '/^\* Status/,$p' BUGS;;
*[[a-z]]*) sed -n '/^\* Status/,$p' $srcdir/BUGS;;
esac

16
tests/Makefile.am
View File

@ -46,13 +46,15 @@ testsuite: $(top_srcdir)/m4sugar.m4 $(top_srcdir)/m4sh.m4 \
mv $@-tmp $@
# The files which contains macro we check for syntax.
MACRO_FILES = $(top_srcdir)/acgeneral.m4 \
$(top_srcdir)/acspecific.m4 \
$(top_srcdir)/acfunctions.m4 \
$(top_srcdir)/aclang.m4 \
$(top_srcdir)/acheaders.m4 \
$(top_srcdir)/actypes.m4
# The files which contains macro we check for syntax. Don't use $(top_srcdir)
# here since below we explicitly `cd' to $srcdir. As for the dependencies,
# thanks God for VPATH. Hm...
MACRO_FILES = ../acgeneral.m4 \
../acspecific.m4 \
../acfunctions.m4 \
../aclang.m4 \
../acheaders.m4 \
../actypes.m4
acgeneral.at: mktests.sh $(MACRO_FILES)
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)

8
tests/Makefile.in
View File

@ -75,8 +75,10 @@ SUITE = suite.at m4sugar.at m4sh.at base.at tools.at torture.at
EXTRA_DIST = README atgeneral.m4 atspecific.m4 aclocal.m4 $(SUITE) mktests.sh
# The files which contains macro we check for syntax.
MACRO_FILES = $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4 $(top_srcdir)/acfunctions.m4 $(top_srcdir)/aclang.m4 $(top_srcdir)/acheaders.m4 $(top_srcdir)/actypes.m4
# The files which contains macro we check for syntax. Don't use $(top_srcdir)
# here since below we explicitly `cd' to $srcdir. As for the dependencies,
# thanks God for VPATH. Hm...
MACRO_FILES = ../acgeneral.m4 ../acspecific.m4 ../acfunctions.m4 ../aclang.m4 ../acheaders.m4 ../actypes.m4
CLEANFILES = debug-*.sh macro configure configure.in configure.ac config.status config.cache config.log config.h.in config.h stderr stdout empty
@ -84,7 +86,7 @@ CLEANFILES = debug-*.sh macro configure configure.in configure.ac c
DISTCLEANFILES = atconfig testsuite
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = atconfig
DIST_COMMON = README Makefile.am Makefile.in atconfig.in configure
DIST_COMMON = README Makefile.am Makefile.in atconfig.in
PACKAGE = @PACKAGE@