From d9540f37bf0948b72f139411dc69a7e2437b0568 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Fri, 5 Jan 2001 23:32:10 +0000
Subject: [PATCH] fixed bugs in configure.in, removed

---
 Makefile.am       |  2 +-
 WINGs/WUtil.h     |  6 +++---
 WINGs/hashtable.c | 12 ++++++------
 configure.in      |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 03daf9db..f689aa03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\
-	contrib
+	contrib 
 
 EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL \
 	Install acconfig.h INSTALL.pt README.pt\
diff --git a/WINGs/WUtil.h b/WINGs/WUtil.h
index aa853664..b3217bc3 100644
--- a/WINGs/WUtil.h
+++ b/WINGs/WUtil.h
@@ -294,18 +294,18 @@ void WMFreeHashTable(WMHashTable *table);
 
 void WMResetHashTable(WMHashTable *table);
 
-const void* WMHashGet(WMHashTable *table, const void *key);
+void* WMHashGet(WMHashTable *table, const void *key);
 
 /* put data in table, replacing already existing data and returning
  * the old value */
-const void* WMHashInsert(WMHashTable *table, const void *key, const void *data);
+void* WMHashInsert(WMHashTable *table, const void *key, const void *data);
 
 void WMHashRemove(WMHashTable *table, const void *key);
 
 /* warning: do not manipulate the table while using these functions */
 WMHashEnumerator WMEnumerateHashTable(WMHashTable *table);
 
-const void* WMNextHashEnumeratorItem(WMHashEnumerator *enumerator);
+void* WMNextHashEnumeratorItem(WMHashEnumerator *enumerator);
 
 unsigned WMCountHashTable(WMHashTable *table);
 
diff --git a/WINGs/hashtable.c b/WINGs/hashtable.c
index 2203c64e..5ea12be3 100644
--- a/WINGs/hashtable.c
+++ b/WINGs/hashtable.c
@@ -186,7 +186,7 @@ WMFreeHashTable(WMHashTable *table)
 
 
 
-const void*
+void*
 WMHashGet(WMHashTable *table, const void *key)
 {
     unsigned h;
@@ -211,14 +211,14 @@ WMHashGet(WMHashTable *table, const void *key)
 	}
     }
     if (item)
-	return item->data;
+	return (void*)item->data;
     else
 	return NULL;
 }
 
 
 
-const void*
+void*
 WMHashInsert(WMHashTable *table, const void *key, const void *data)
 {
     unsigned h;
@@ -254,7 +254,7 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
 	RELKEY(table, item->key);
 	item->key = DUPKEY(table, key);
 
-	return old;
+	return (void*)old;
     } else {
 	HashItem *nitem;
 
@@ -334,7 +334,7 @@ WMEnumerateHashTable(WMHashTable *table)
 
 
 
-const void*
+void*
 WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
 {
     const void *data = NULL;
@@ -357,7 +357,7 @@ WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
 	enumerator->nextItem = ((HashItem*)enumerator->nextItem)->next;
     }
     
-    return data;
+    return (void*)data;
 }
 
 
diff --git a/configure.in b/configure.in
index 75013296..7958b154 100644
--- a/configure.in
+++ b/configure.in
@@ -184,7 +184,7 @@ if test "$ac_cv_prog_gcc" = yes; then
     esac
     changequote([,])dnl
 
-    if $host_os != "linux"; then
+    if  test "$host_os" != "linux" -a "$host_os" != "linux-gnu" ; then
 	x86=0
     fi
 
@@ -864,6 +864,7 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \
 	WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
 	WPrefs.app/po/Makefile contrib/WindowMaker.spec )
+#	plugins/Makefile plugins/libwmfun/Makefile)