Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
450
Issues
450
List
Boards
Labels
Service Desk
Milestones
Merge Requests
75
Merge Requests
75
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
39167c04
Commit
39167c04
authored
May 11, 2015
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Plain Diff
[master] Merge branch 'master' of
ssh://git.kea.isc.org/git/kea
parents
e40b70f8
4ba32d6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
ChangeLog
ChangeLog
+6
-0
configure.ac
configure.ac
+14
-0
tools/path_replacer.sh.in
tools/path_replacer.sh.in
+1
-1
No files found.
ChangeLog
View file @
39167c04
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 741ff09b743307bad28ae13db440e5e0f402d319)
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.
...
...
configure.ac
View file @
39167c04
...
...
@@ -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.
...
...
tools/path_replacer.sh.in
View file @
39167c04
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment