Fix package name recognition in bootstrap.

The script logic failed if AC_INIT was split among two lines.  Reported
by Pavel.

* bootstrap (extract_package_name): Rewrite as m4 script to allow
for multiline AC_INIT.

1 files changed, 4 insertions, 18 deletions

diff --git a/bootstrap b/bootstrap
index f7f6c56..aeb46e0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -82,20 +82,6 @@ po_download_command_format=\
 
-extract_package_name='
-  /^AC_INIT(/{
-     /.*,.*,.*, */{
-       s///
-       s/[][]//g
-       s/)$//
-       p
-       q
-     }
-     s/AC_INIT(\[*//
-     s/]*,.*//
-     s/^GNU //
-     y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^A-Za-z0-9_]/-/g
-     p
-  }
-'
-package=`sed -n "$extract_package_name" configure.ac` || exit
+extract_package_name='divert(-1)[]changequote([,])[]define([AC_INIT],[divert(0)[]patsubst([$1],[GNU ],[])[]divert(-1)])'
+
+package=`echo $extract_package_name | m4 - configure.ac` || exit
+
 gnulib_name=lib$package