Changeset 00f434f

Timestamp:

2005-12-18T14:28:52Z (18 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:

• conf.c (modified) (1 diff)
• conf.h (modified) (1 diff)
• configure (modified) (2 diffs)
• protocols/nogaim.c (modified) (2 diffs)

conf.c

@@ -55 +55 @@
         conf->password = NULL;
         conf->configdir = g_strdup( CONFIG );
+        conf->plugindir = g_strdup( PLUGINDIR );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;

conf.h

@@ -41 +41 @@
         char *hostname;
         char *configdir;
+        char *plugindir;
         char *motdfile;
         char *primary_storage;

configure

@@ -145 +145 @@
 fi
 
-if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
+if [ -z "$PKG_CONFIG" ]; then
+        PKG_CONFIG=pkg-config
+fi
+
+if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         cat<<EOF>>Makefile.settings
-EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0`
-CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0`
+EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
+CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
 EOF
         echo '#define GLIB2' >> config.h
@@ -190 +194 @@
 detect_nss()
 {
-        if type pkg-config > /dev/null 2>/dev/null && pkg-config mozilla-nss; then
+        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG mozilla-nss; then
                 cat<<EOF>>Makefile.settings
-EFLAGS+=`pkg-config --libs mozilla-nss`
-CFLAGS+=`pkg-config --cflags mozilla-nss`
+EFLAGS+=`$PKG_CONFIG --libs mozilla-nss`
+CFLAGS+=`$PKG_CONFIG --cflags mozilla-nss`
 EOF
                 

protocols/nogaim.c

@@ -82 +82 @@
         GError *error = NULL;
 
-        dir = g_dir_open(PLUGINDIR, 0, &error);
+        dir = g_dir_open(global.conf->plugindir, 0, &error);
 
         if (dir) {
@@ -89 +89 @@
 
                 while ((entry = g_dir_read_name(dir))) {
-                        path = g_build_filename(PLUGINDIR, entry, NULL);
+                        path = g_build_filename(global.conf->plugindir, entry, NULL);
                         if(!path) {
                                 log_message(LOGLVL_WARNING, "Can't build path for %s\n", entry);