Changes in / [00f434f:578d627]
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
conf.c
r00f434f r578d627 55 55 conf->password = NULL; 56 56 conf->configdir = g_strdup( CONFIG ); 57 conf->plugindir = g_strdup( PLUGINDIR );58 57 conf->motdfile = g_strdup( ETCDIR "/motd.txt" ); 59 58 conf->ping_interval = 180; -
conf.h
r00f434f r578d627 41 41 char *hostname; 42 42 char *configdir; 43 char *plugindir;44 43 char *motdfile; 45 44 char *primary_storage; -
configure
r00f434f r578d627 145 145 fi 146 146 147 if [ -z "$PKG_CONFIG" ]; then 148 PKG_CONFIG=pkg-config 149 fi 150 151 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then 147 if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then 152 148 cat<<EOF>>Makefile.settings 153 EFLAGS+=` $PKG_CONFIG--libs glib-2.0 gmodule-2.0`154 CFLAGS+=` $PKG_CONFIG--cflags glib-2.0 gmodule-2.0`149 EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0` 150 CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0` 155 151 EOF 156 152 echo '#define GLIB2' >> config.h … … 194 190 detect_nss() 195 191 { 196 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIGmozilla-nss; then192 if type pkg-config > /dev/null 2>/dev/null && pkg-config mozilla-nss; then 197 193 cat<<EOF>>Makefile.settings 198 EFLAGS+=` $PKG_CONFIG--libs mozilla-nss`199 CFLAGS+=` $PKG_CONFIG--cflags mozilla-nss`194 EFLAGS+=`pkg-config --libs mozilla-nss` 195 CFLAGS+=`pkg-config --cflags mozilla-nss` 200 196 EOF 201 197 -
protocols/nogaim.c
r00f434f r578d627 82 82 GError *error = NULL; 83 83 84 dir = g_dir_open( global.conf->plugindir, 0, &error);84 dir = g_dir_open(PLUGINDIR, 0, &error); 85 85 86 86 if (dir) { … … 89 89 90 90 while ((entry = g_dir_read_name(dir))) { 91 path = g_build_filename( global.conf->plugindir, entry, NULL);91 path = g_build_filename(PLUGINDIR, entry, NULL); 92 92 if(!path) { 93 93 log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);
Note: See TracChangeset
for help on using the changeset viewer.