Skip to content
Snippets Groups Projects
Commit 7de53f18 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

New option --srcdir for root-config, printing top level original source dir.

Works for both cmake and classic builds.
parent 8c9659e1
Branches
Tags
No related merge requests found
...@@ -423,6 +423,7 @@ auxcflags="$auxcflags @usercflags@" ...@@ -423,6 +423,7 @@ auxcflags="$auxcflags @usercflags@"
### end of machine and compiler dependent settings ### ### end of machine and compiler dependent settings ###
srcdir=@top_srcdir@
prefix=@prefix@ prefix=@prefix@
if test "$platform" = "win32" && test "$prefix" != ""; then if test "$platform" = "win32" && test "$prefix" != ""; then
prefix=`cygpath -u $prefix` prefix=`cygpath -u $prefix`
...@@ -438,8 +439,8 @@ noldflags=no ...@@ -438,8 +439,8 @@ noldflags=no
usage="\ usage="\
Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]\ Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]\
[--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs]\ [--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs]\
[--glibs] [--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir]\ [--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir] [--srcdir]\
[--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch]\ [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch]\
[--platform] [--config] [--features] [--ncpu] [--git-revision]\ [--platform] [--config] [--features] [--ncpu] [--git-revision]\
[--python-version] [--cc] [--cxx] [--f77] [--ld ] [--help]" [--python-version] [--cc] [--cxx] [--f77] [--ld ] [--help]"
...@@ -736,6 +737,10 @@ while test $# -gt 0; do ...@@ -736,6 +737,10 @@ while test $# -gt 0; do
### output the etc directory ### output the etc directory
out="$out $etcdir" out="$out $etcdir"
;; ;;
--srcdir)
### output the src directory
out="$out $srcdir"
;;
--config) --config)
### output the configure arguments ### output the configure arguments
out="$out $configargs" out="$out $configargs"
...@@ -800,6 +805,7 @@ while test $# -gt 0; do ...@@ -800,6 +805,7 @@ while test $# -gt 0; do
echo " --libdir Print the library directory" echo " --libdir Print the library directory"
echo " --incdir Print the header directory" echo " --incdir Print the header directory"
echo " --etcdir Print the configuration directory" echo " --etcdir Print the configuration directory"
echo " --srcdir Print the top of the original source directory"
echo " --auxlibs Print auxiliary libraries" echo " --auxlibs Print auxiliary libraries"
echo " --auxcflags Print auxiliary compiler flags" echo " --auxcflags Print auxiliary compiler flags"
echo " --[no]new Turn on[off] use of libNew.so" echo " --[no]new Turn on[off] use of libNew.so"
......
...@@ -8195,6 +8195,7 @@ sed -e "s|@architecture@|$arch|" \ ...@@ -8195,6 +8195,7 @@ sed -e "s|@architecture@|$arch|" \
-e "s|@libdir@|$libdir2|" \ -e "s|@libdir@|$libdir2|" \
-e "s|@incdir@|$incdir2|" \ -e "s|@incdir@|$incdir2|" \
-e "s|@etcdir@|$etcdir2|" \ -e "s|@etcdir@|$etcdir2|" \
-e "s|@top_srcdir@|$top_srcdir|" \
-e "s|@features@|$features|" \ -e "s|@features@|$features|" \
-e "s|@winrtdebug@|$enable_winrtdebug|"\ -e "s|@winrtdebug@|$enable_winrtdebug|"\
-e "s|@configargs@|$configargs|" \ -e "s|@configargs@|$configargs|" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment