From 0e71fd9f70fdf427a0723451c43bdce505e314c0 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 19 Apr 2005 17:19:39 +0000
Subject: [PATCH] 	Remove extra whitespace and tab when joining
 backslashed lines.

---
 apps/autodist/CHANGES              |  4 ++++
 apps/autodist/autodist.in          |  4 ++--
 apps/autodist/tests/autodist1.test | 12 +++++++++---
 apps/autodist/tests/autodist2.test |  7 ++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index f17113f..b53b6d0 100644
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,3 +1,7 @@
+Tue Apr 19 17:12:09 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
+
+	* Remove extra ' ' and '\t' when joining backslashed lines.
+
 Mon Apr 18 21:05:42 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
 	* Process '*.ad' files before calling autoconf and automake.
diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 67a2663..ecb793c 100755
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -376,7 +376,7 @@ ad_make_configure_ac()
 
   # Remove any trailing backslashes
   if test -f "$fname"; then
-    cat $fname | sed -e :a -e '/\\$/N; s/\\\n//; ta' > configure.ac
+    cat $fname | sed -e :a -e '/\\$/N; s/[ 	]*\\\n//; ta' > configure.ac
   else
     cp -p $fname.tmp configure.ac
   fi
@@ -437,7 +437,7 @@ ad_make_makefile_ams()
 
     # Remove any trailing backslashes
     if test -f "$fname.tmp"; then
-      cat $fname.tmp | sed -e :a -e '/\\$/N; s/\\\n//; ta' >> $fname.am
+      cat $fname.tmp | sed -e :a -e '/\\$/N; s/[ 	]*\\\n//; ta' >> $fname.am
     else
       cat $ff >> $fname.am
     fi
diff --git a/apps/autodist/tests/autodist1.test b/apps/autodist/tests/autodist1.test
index 2ea7cc4..5175a28 100755
--- a/apps/autodist/tests/autodist1.test
+++ b/apps/autodist/tests/autodist1.test
@@ -26,11 +26,17 @@ echo configure.ad ok
 EOF
 
 cat << EOF > Makefile.ad
-SUBDIRS=	\
+SUBDIRS=	\\
 #ifdef _DIST_NODEF
-	nodef	\
+	nodef	\\
+	poa	\\
+	paa	\\
 #endif _DIST_NODEF
-#endif
+	.	\\
+	.	\\
+	.	\\
+	.	\\
+
 EOF
 
 rm -rf distdir subdir
diff --git a/apps/autodist/tests/autodist2.test b/apps/autodist/tests/autodist2.test
index 3a01e4f..780b168 100755
--- a/apps/autodist/tests/autodist2.test
+++ b/apps/autodist/tests/autodist2.test
@@ -26,11 +26,12 @@ echo configure.ad ok
 EOF
 
 cat << EOF > Makefile.ad
-SUBDIRS=	\
+SUBDIRS=	\\
 #ifndef _DIST_TEST
-	nodef	\
+	nodef	\\
 #endif _DIST_TEST
-#endif
+	.	\\
+
 EOF
 
 rm -rf distdir subdir
-- 
2.24.0