diff options
| author | Alexandre Oliva <oliva@samba.org> | 1998-09-28 00:14:36 +0000 |
|---|---|---|
| committer | Alexandre Oliva <oliva@samba.org> | 1998-09-28 00:14:36 +0000 |
| commit | cf971f88ac188eec353a7fb021744b8076cc4eb7 (patch) | |
| tree | e73d26b9068c7d17e7af42ce562fff7e303c0206 /source3/configure | |
| parent | 464f71f414a09727250e5c918405fbbc601b7c32 (diff) | |
| download | samba-cf971f88ac188eec353a7fb021744b8076cc4eb7.tar.gz samba-cf971f88ac188eec353a7fb021744b8076cc4eb7.tar.bz2 samba-cf971f88ac188eec353a7fb021744b8076cc4eb7.zip | |
automated generation of .dummy files for each subdirectory;
dummy.in files are no longer needed, and new directories will be taken
care of automatically, at configure (or config.status --recheck) time
(This used to be commit 237a8e5fe62d757c04b8207cbbee4df1470cfe4e)
Diffstat (limited to 'source3/configure')
| -rwxr-xr-x | source3/configure | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source3/configure b/source3/configure index 9cac348e42..bea4852b23 100755 --- a/source3/configure +++ b/source3/configure @@ -5632,6 +5632,13 @@ rm -fr conftest* fi +DUMMY_FILES=`cd ${srcdir-.} >/dev/null && + echo */. | sed 's, ,dummy ,g;s,$,dummy,'` + +DUMMY_BASE=:include/stamp-h.in + + +DUMMY_GEN=`echo "$DUMMY_FILES" | sed "s, ,$DUMMY_BASE ,g;s,\$,$DUMMY_BASE,"` trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -5733,11 +5740,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy -web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy -rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy -script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy -utils/dummy printing/dummy include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "$DUMMY_GEN Makefile include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -5792,6 +5795,8 @@ s%@AUTOCONF@%$AUTOCONF%g s%@AUTOHEADER@%$AUTOHEADER%g s%@CPP@%$CPP%g s%@LIBOBJS@%$LIBOBJS%g +s%@DUMMY_FILES@%$DUMMY_FILES%g +s%@DUMMY_BASE@%$DUMMY_BASE%g CEOF EOF @@ -5833,11 +5838,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy -web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy -rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy -script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy -utils/dummy printing/dummy include/stamp-h"} +CONFIG_FILES=\${CONFIG_FILES-"$DUMMY_GEN Makefile include/stamp-h"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then |