old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thu Nov 7 12:37:08 2002 Michael Jennings (mej) 

Fixed typo in configure.in that caused ESCREEN to always be defined.

Added support for /etc/screen/screenrc, as it is on gentoo.


SVN revision: 6442
This commit is contained in:
Michael Jennings 2002-11-07 17:38:00 +00:00
parent 01c9e2811a
commit c90247ce54
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -4912,3 +4912,9 @@ Mon Nov 4 17:33:00 2002 Michael Jennings (mej)
Let's try that again, shall we?
----------------------------------------------------------------------
Thu Nov 7 12:37:08 2002 Michael Jennings (mej)
Fixed typo in configure.in that caused ESCREEN to always be defined.
Added support for /etc/screen/screenrc, as it is on gentoo.
----------------------------------------------------------------------

6
configure.in
View File

@ -387,11 +387,7 @@ AC_ARG_ENABLE(etwin,
fi], AC_MSG_RESULT(no)
)
if test ! -z "FOUND_$SCREEN" || ! -z "$FOUND_LIBTWIN"; then
AC_DEFINE(ESCREEN)
fi
if test ! -z "FOUND_$SCREEN" || ! -z "$FOUND_LIBTWIN"; then
if test ! -z "$FOUND_SCREEN" || ! -z "$FOUND_LIBTWIN"; then
AC_DEFINE(ESCREEN)
fi

10
src/libscream.c
View File

@ -1374,10 +1374,12 @@ ns_attach_by_URL(char *url, char *hop, _ns_efuns ** ef, int *err, void *xd)
if (!(sess->sysrc = STRDUP(getenv("SCREENRC"))))
goto fail;
} else {
char *loc[] = { "/usr/local/etc/screenrc", /* official */
"/etc/screenrc", /* actual (on SuSE) */
"/usr/etc/screenrc",
"/opt/etc/screenrc"
char *loc[] = {
"/usr/local/etc/screenrc", /* official */
"/etc/screenrc", /* actual (on SuSE) */
"/usr/etc/screenrc",
"/opt/etc/screenrc",
"/etc/screen/screenrc"
};
int n, nloc = sizeof(loc) / sizeof(char *);