d3020a6321ecaaa8b94bb832d30e677752ed6727 chinhli Tue May 15 17:24:26 2012 -0700 hgLogin.c will not compile with openssl lib. See http://redmine.soe.ucsc.edu/issues/7824#note-6 for more detail. diff --git src/hg/lib/wikiLink.c src/hg/lib/wikiLink.c index 729834a..e42cef5 100644 --- src/hg/lib/wikiLink.c +++ src/hg/lib/wikiLink.c @@ -7,31 +7,35 @@ #include "hgConfig.h" #include "hui.h" #include "cart.h" #include "web.h" #include "wikiLink.h" char *loginSystemName() /* Return the wiki host specified in hg.conf, or NULL. Allocd here. */ { return cloneString(cfgOption(CFG_LOGIN_SYSTEM_NAME)); } boolean loginSystemEnabled() /* Return TRUE if login.systemName parameter is defined in hg.conf . */ { +#ifdef USE_SSL return (cfgOption(CFG_LOGIN_SYSTEM_NAME) != NULL); +#else +return FALSE; +#endif } char *wikiLinkHost() /* Return the wiki host specified in hg.conf, or NULL. Allocd here. */ { return cloneString(cfgOption(CFG_WIKI_HOST)); } boolean wikiLinkEnabled() /* Return TRUE if all wiki.* parameters are defined in hg.conf . */ { return ((cfgOption(CFG_WIKI_HOST) != NULL) && (cfgOption(CFG_WIKI_USER_NAME_COOKIE) != NULL) && (cfgOption(CFG_WIKI_LOGGED_IN_COOKIE) != NULL)); }