diff options
| author | Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> | 2010-06-21 22:26:54 -0400 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> | 2010-06-21 22:26:54 -0400 |
| commit | dfab4600877ee79c6ff004e88f331ff300ba2ad7 (patch) | |
| tree | 05b2ec1f601526071b248eb0c0bdc02a1e36433c | |
| parent | 2f565ead2d6cb059dba39da47a5cde105bd35125 (diff) | |
| download | screen-dfab4600877ee79c6ff004e88f331ff300ba2ad7.tar.gz | |
Bring back --with-sys-screenrc configure flag.
| -rw-r--r-- | src/Makefile.in | 5 | ||||
| -rw-r--r-- | src/configure.in | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 2ae57d0..d087311 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -25,7 +25,10 @@ SCREEN = screen-$(VERSION) GIT_REV = "`git describe --always 2>/dev/null`" DEFS = @DEFS@ -DGIT_REV=\"$(GIT_REV)\" -ETCSCREENRC = $(prefix)/etc/screenrc +ETCSCREENRC = @ETCSCREENRC@ +ifeq (${ETCSCREENRC}, ) +ETCSCREENRC=$(prefix)/etc/screenrc +endif SCREENENCODINGS = $(datadir)/screen/utf8encodings CC = @CC@ diff --git a/src/configure.in b/src/configure.in index 448bafd..4184947 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1294,6 +1294,11 @@ test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.)) +ETCSCREENRC= +AC_MSG_CHECKING(for the global screenrc file) +AC_ARG_WITH(sys-screenrc, [ --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ]) +AC_SUBST(ETCSCREENRC) + AC_OUTPUT(Makefile doc/Makefile, [[ # a hook for preserving undef directive in config.h mv config.h conftest |