Changeset 00f434f


Ignore:
Timestamp:
2005-12-18T14:28:52Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
1fa6a23, 7308b63
Parents:
578d627 (diff), 32c632f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Stuff from Jelmer.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • conf.c

    r578d627 r00f434f  
    5555        conf->password = NULL;
    5656        conf->configdir = g_strdup( CONFIG );
     57        conf->plugindir = g_strdup( PLUGINDIR );
    5758        conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
    5859        conf->ping_interval = 180;
  • conf.h

    r578d627 r00f434f  
    4141        char *hostname;
    4242        char *configdir;
     43        char *plugindir;
    4344        char *motdfile;
    4445        char *primary_storage;
  • configure

    r578d627 r00f434f  
    145145fi
    146146
    147 if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
     147if [ -z "$PKG_CONFIG" ]; then
     148        PKG_CONFIG=pkg-config
     149fi
     150
     151if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
    148152        cat<<EOF>>Makefile.settings
    149 EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0`
    150 CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0`
     153EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
     154CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
    151155EOF
    152156        echo '#define GLIB2' >> config.h
     
    190194detect_nss()
    191195{
    192         if type pkg-config > /dev/null 2>/dev/null && pkg-config mozilla-nss; then
     196        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG mozilla-nss; then
    193197                cat<<EOF>>Makefile.settings
    194 EFLAGS+=`pkg-config --libs mozilla-nss`
    195 CFLAGS+=`pkg-config --cflags mozilla-nss`
     198EFLAGS+=`$PKG_CONFIG --libs mozilla-nss`
     199CFLAGS+=`$PKG_CONFIG --cflags mozilla-nss`
    196200EOF
    197201               
  • protocols/nogaim.c

    r578d627 r00f434f  
    8282        GError *error = NULL;
    8383
    84         dir = g_dir_open(PLUGINDIR, 0, &error);
     84        dir = g_dir_open(global.conf->plugindir, 0, &error);
    8585
    8686        if (dir) {
     
    8989
    9090                while ((entry = g_dir_read_name(dir))) {
    91                         path = g_build_filename(PLUGINDIR, entry, NULL);
     91                        path = g_build_filename(global.conf->plugindir, entry, NULL);
    9292                        if(!path) {
    9393                                log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);
Note: See TracChangeset for help on using the changeset viewer.