[master] fixed the silly + vs path_replacer.sh issue (#3713)

diff --git a/ChangeLog b/ChangeLog
index 85604387b1d100c120c8b11958cb2929302b07ea..2f6f6aae461d6134ddf1d3f2c5f7f666a1786b0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+929    [build]         fdupont
+       Corrected problem in build system whereby specifying an
+       installation directory on the "configure" command line that
+       included a "+" in the name caused the build to fail.
+       (Trac #3713, git xxx)
+
 928.   [build]         fdupont
        A CONFIG_H_WAS_INCLUDED define has been added to provide
        a way in source files to check whether config.h has been included.

diff --git a/configure.ac b/configure.ac
index 9789c68ee8286039ae4491db6895d62d671e4602..28034683470c5f6c940f170382da67b8ba6cf6e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,20 @@ fi
 # This will be either "tarball" or "git abcd".
 AC_DEFINE_UNQUOTED([EXTENDED_VERSION], ["${KEA_SRCID}"], [Extended Kea version])
 
+# Find a separator for path_replacer
+for sep in "+" "," ";" "&" "__NONE__"; do
+       if `pwd | grep -q $sep`; then continue; fi
+       if `echo ${prefix} | grep -q $sep`; then continue; fi
+       if `echo ${sysconfdir} | grep -q $sep`; then continue; fi
+       if `echo ${localstatedir} | grep -q $sep`; then continue; fi
+       SEP=$sep
+       break
+done
+if test "$sep" = "__NONE__"; then
+       AC_MSG_ERROR([can't find a separator character in '+,;&' for the path_replacer shell script])
+fi
+AC_SUBST(SEP)
+
 # Enable low-performing debugging facilities? This option optionally
 # enables some debugging aids that perform slowly and hence aren't built
 # by default.

diff --git a/tools/path_replacer.sh.in b/tools/path_replacer.sh.in
index 43d7bff2591f304316b0aef0a95168ddf182bbfb..300ef7710a357aedb2077c43f17d87d1f0a31aa9 100644 (file)
--- a/tools/path_replacer.sh.in
+++ b/tools/path_replacer.sh.in
@@ -35,4 +35,4 @@ echo "Replacing \@localstatedir\@ with ${localstatedir}"
 echo "Input file: $1"
 echo "Output file: $2"
 
-sed -e "s+\@localstatedir\@+${localstatedir}+g; s+\@prefix@+${prefix}+g; s+\@sysconfdir@+${sysconfdir}+g" $1 > $2
+sed -e "s@SEP@\@localstatedir\@@SEP@${localstatedir}@SEP@g; s@SEP@\@prefix@@SEP@${prefix}@SEP@g; s@SEP@\@sysconfdir@@SEP@${sysconfdir}@SEP@g" $1 > $2