From 6e14a3fccb9fb79280fd164767c06c831f88c357 Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Tue, 14 May 2013 20:12:06 -0400 Subject: [PATCH] adjust to new autoconf requirements --- bootstrap | 25 ++++++++++++++----------- configure.in => configure.ac | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) rename configure.in => configure.ac (99%) diff --git a/bootstrap b/bootstrap index 87704441..e614ff67 100755 --- a/bootstrap +++ b/bootstrap @@ -50,12 +50,13 @@ fi echo "AMU: Fixing ylwrap..." patch << \EOF ---- ylwrap.orig 2012-11-21 15:40:56.893090185 -0500 -+++ ylwrap 2012-11-21 15:40:57.221097911 -0500 -@@ -175,8 +175,21 @@ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - +--- ylwrap.orig 2013-05-14 20:00:39.000000000 -0400 ++++ ylwrap 2013-05-14 20:06:06.000000000 -0400 +@@ -199,8 +199,24 @@ + # include guards too. + FROM=`guard "$from"` + TARGET=`guard "$to"` ++ + prefix=`echo $input | sed \ + -e 's,^.*/,,g' \ + -e 's/_parse.[yl]$/_/g' \ @@ -69,12 +70,14 @@ patch << \EOF + *) + code_prefix="$prefix";; + esac - sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ -- -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? -+ -e "s,$FROM,$TARGET," "$from" | sed "s/yy/$code_prefix/g" > "$target" || ret=$? ++ + sed -e "/^#/!b" -e "s|$input_rx|$input_sub_rx|" -e "$rename_sed" \ +- -e "s|$FROM|$TARGET|" "$from" >"$target" || ret=$? ++ -e "s|$FROM|$TARGET|" "$from" | sed -e "s|yy|$code_prefix|g" > \ ++ "$target" || ret=$? - # Check whether header files must be updated. - if test $first = no; then + # Check whether files must be updated. + if test "$from" != "$parser"; then \EOF # save timestamp diff --git a/configure.in b/configure.ac similarity index 99% rename from configure.in rename to configure.ac index 04131505..9dcaa09d 100644 --- a/configure.in +++ b/configure.ac @@ -71,7 +71,7 @@ AC_MSG_NOTICE(*** PACKAGE NAME AND VERSION ***) AMU_PACKAGE_NAME($PACKAGE_NAME) AMU_PACKAGE_VERSION($PACKAGE_VERSION) AMU_PACKAGE_BUGREPORT($PACKAGE_BUGREPORT) -AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) +AM_INIT_AUTOMAKE dnl SET (shared) library version. Update it only before major release! dnl Clarification: dnl The major number should change when an incompatible change is made to -- 2.34.1