aboutsummaryrefslogtreecommitdiff
path: root/hardinfo2
diff options
context:
space:
mode:
authorLeandro Pereira <leandro@daileon.acd.puc-campinas.edu.br>2008-10-28 11:46:58 -0200
committerLeandro Pereira <leandro@daileon.acd.puc-campinas.edu.br>2008-10-28 11:46:58 -0200
commit32d83fb15ba35b0fe621b3be2c44ec581bebe394 (patch)
tree7157c41bc6247d96dc409dcc3da539659fc9bdd3 /hardinfo2
parent7e3d8ba8bdc98bc3018628a6f1d740c4f4c268ae (diff)
Fix typo and compilation error when libsoup support is not being compiled in
Diffstat (limited to 'hardinfo2')
-rw-r--r--hardinfo2/callbacks.c2
-rwxr-xr-xhardinfo2/configure2
-rw-r--r--hardinfo2/hardinfo.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/hardinfo2/callbacks.c b/hardinfo2/callbacks.c
index 775475d9..679ad3bd 100644
--- a/hardinfo2/callbacks.c
+++ b/hardinfo2/callbacks.c
@@ -200,7 +200,7 @@ void cb_about()
"",
"Based on work by:",
"MD5 implementation by Colin Plumb (see md5.c for details)",
- "SHA1 implementation by Steve Raid (see sha1.c for details)",
+ "SHA1 implementation by Steve Reid (see sha1.c for details)",
"Blowfish implementation by Paul Kocher (see blowfich.c for details)",
"Raytracing benchmark by John Walker (see fbench.c for details)",
"Some code partly based on x86cpucaps by Osamu Kayasono",
diff --git a/hardinfo2/configure b/hardinfo2/configure
index 0b4d0371..d8113727 100755
--- a/hardinfo2/configure
+++ b/hardinfo2/configure
@@ -235,7 +235,7 @@ echo -e "\n#endif /* __CONFIG_H__ */" >> config.h
echo "Writing Makefile..."
rm -f Makefile
-echo "GTK_LIBS = ${GTK_LIBS}" > Makefile
+echo "GTK_LIBS = -lpthread -lgthread-2.0 -lrt ${GTK_LIBS}" > Makefile
echo "GTK_CFLAGS = ${GTK_FLAGS}" >> Makefile
echo "SOUP_LIBS = ${SOUP_LIBS}" >> Makefile
echo "SOUP_CFLAGS = ${SOUP_FLAGS}" >> Makefile
diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c
index 470611fe..34caca04 100644
--- a/hardinfo2/hardinfo.c
+++ b/hardinfo2/hardinfo.c
@@ -34,11 +34,9 @@ int main(int argc, char **argv)
DEBUG("HardInfo version " VERSION ". Debug version.");
-#ifdef HAS_LIBSOUP
DEBUG("g_thread_init()");
if (!g_thread_supported())
g_thread_init(NULL);
-#endif /* HAS_LIBSOUP */
/* parse all command line parameters */
parameters_init(&argc, &argv, &params);