WindowMaker/wm-giflib.patch

---
 WINGs/Examples/colorpick.c      |    4 ++++
 WINGs/Examples/fontl.c          |    4 ++++
 WINGs/Examples/puzzle.c         |    4 ++++
 WINGs/Extras/test.c             |    4 ++++
 WINGs/Extras/wtabledelegates.c  |    4 ++++
 WINGs/Extras/wtableview.c       |    4 ++++
 WINGs/Tests/mywidget.c          |    4 ++++
 WINGs/Tests/testmywidget.c      |    4 ++++
 WINGs/Tests/wmfile.c            |    4 ++++
 WINGs/Tests/wmquery.c           |    4 ++++
 WINGs/Tests/wtest.c             |    4 ++++
 WINGs/array.c                   |    4 ++++
 WINGs/bagtree.c                 |    4 ++++
 WINGs/configuration.c           |    4 ++++
 WINGs/data.c                    |    4 ++++
 WINGs/dragcommon.c              |    4 ++++
 WINGs/dragdestination.c         |    4 ++++
 WINGs/dragsource.c              |    4 ++++
 WINGs/error.c                   |    4 ++++
 WINGs/findfile.c                |    4 ++++
 WINGs/handlers.c                |    4 ++++
 WINGs/hashtable.c               |    4 ++++
 WINGs/memory.c                  |    4 ++++
 WINGs/misc.c                    |    4 ++++
 WINGs/notification.c            |    4 ++++
 WINGs/proplist.c                |    4 ++++
 WINGs/selection.c               |    4 ++++
 WINGs/string.c                  |    4 ++++
 WINGs/tree.c                    |    4 ++++
 WINGs/userdefaults.c            |    4 ++++
 WINGs/usleep.c                  |    4 ++++
 WINGs/wapplication.c            |    4 ++++
 WINGs/wappresource.c            |    4 ++++
 WINGs/wballoon.c                |    4 ++++
 WINGs/wbox.c                    |    4 ++++
 WINGs/wbrowser.c                |    4 ++++
 WINGs/wbutton.c                 |    4 ++++
 WINGs/wcolor.c                  |    4 ++++
 WINGs/wcolorpanel.c             |    4 ++++
 WINGs/wcolorwell.c              |    4 ++++
 WINGs/wevent.c                  |    4 ++++
 WINGs/wfilepanel.c              |    4 ++++
 WINGs/wfont.c                   |    4 ++++
 WINGs/wfontpanel.c              |    4 ++++
 WINGs/wframe.c                  |    4 ++++
 WINGs/widgets.c                 |    4 ++++
 WINGs/winputmethod.c            |    4 ++++
 WINGs/wlabel.c                  |    4 ++++
 WINGs/wlist.c                   |    4 ++++
 WINGs/wmenuitem.c               |    4 ++++
 WINGs/wmisc.c                   |    4 ++++
 WINGs/wpanel.c                  |    4 ++++
 WINGs/wpixmap.c                 |    4 ++++
 WINGs/wpopupbutton.c            |    4 ++++
 WINGs/wprogressindicator.c      |    4 ++++
 WINGs/wruler.c                  |    4 ++++
 WINGs/wscroller.c               |    4 ++++
 WINGs/wscrollview.c             |    4 ++++
 WINGs/wslider.c                 |    4 ++++
 WINGs/wsplitview.c              |    4 ++++
 WINGs/wtabview.c                |    4 ++++
 WINGs/wtext.c                   |    4 ++++
 WINGs/wtextfield.c              |    4 ++++
 WINGs/wutil.c                   |    4 ++++
 WINGs/wview.c                   |    4 ++++
 WINGs/wwindow.c                 |    4 ++++
 WPrefs.app/Appearance.c         |    4 ++++
 WPrefs.app/Configurations.c     |    4 ++++
 WPrefs.app/Expert.c             |    4 ++++
 WPrefs.app/Focus.c              |    4 ++++
 WPrefs.app/FontSimple.c         |    4 ++++
 WPrefs.app/Icons.c              |    4 ++++
 WPrefs.app/KeyboardSettings.c   |    4 ++++
 WPrefs.app/Menu.c               |    4 ++++
 WPrefs.app/MenuPreferences.c    |    4 ++++
 WPrefs.app/MouseSettings.c      |    4 ++++
 WPrefs.app/Paths.c              |    4 ++++
 WPrefs.app/Preferences.c        |    4 ++++
 WPrefs.app/TexturePanel.c       |    4 ++++
 WPrefs.app/Themes.c             |    4 ++++
 WPrefs.app/WPrefs.c             |    4 ++++
 WPrefs.app/WindowHandling.c     |    4 ++++
 WPrefs.app/Workspace.c          |    4 ++++
 WPrefs.app/double.c             |    4 ++++
 WPrefs.app/editmenu.c           |    4 ++++
 WPrefs.app/main.c               |    4 ++++
 WPrefs.app/xmodifier.c          |    4 ++++
 configure.ac                    |    5 +++--
 src/actions.c                   |    4 ++++
 src/appicon.c                   |    4 ++++
 src/application.c               |    4 ++++
 src/appmenu.c                   |    4 ++++
 src/balloon.c                   |    4 ++++
 src/client.c                    |    4 ++++
 src/colormap.c                  |    4 ++++
 src/cycling.c                   |    4 ++++
 src/defaults.c                  |    4 ++++
 src/dialog.c                    |    4 ++++
 src/dock.c                      |    4 ++++
 src/dockedapp.c                 |    4 ++++
 src/event.c                     |    4 ++++
 src/framewin.c                  |    4 ++++
 src/geomview.c                  |    4 ++++
 src/icon.c                      |    4 ++++
 src/main.c                      |    4 ++++
 src/menu.c                      |    4 ++++
 src/misc.c                      |    4 ++++
 src/monitor.c                   |    4 ++++
 src/motif.c                     |    4 ++++
 src/moveres.c                   |    4 ++++
 src/osdep_bsd.c                 |    4 ++++
 src/osdep_darwin.c              |    4 ++++
 src/osdep_linux.c               |    4 ++++
 src/osdep_stub.c                |    4 ++++
 src/pixmap.c                    |    4 ++++
 src/placement.c                 |    4 ++++
 src/properties.c                |    4 ++++
 src/resources.c                 |    4 ++++
 src/rootmenu.c                  |    4 ++++
 src/screen.c                    |    4 ++++
 src/session.c                   |    4 ++++
 src/shutdown.c                  |    4 ++++
 src/stacking.c                  |    4 ++++
 src/startup.c                   |    4 ++++
 src/superfluous.c               |    4 ++++
 src/switchmenu.c                |    4 ++++
 src/switchpanel.c               |    4 ++++
 src/texture.c                   |    4 ++++
 src/usermenu.c                  |    4 ++++
 src/wcore.c                     |    4 ++++
 src/wdefaults.c                 |    4 ++++
 src/window.c                    |    4 ++++
 src/winmenu.c                   |    4 ++++
 src/winspector.c                |    4 ++++
 src/wmspec.c                    |    4 ++++
 src/workspace.c                 |    4 ++++
 src/xdnd.c                      |    4 ++++
 src/xinerama.c                  |    4 ++++
 src/xmodifier.c                 |    4 ++++
 src/xutil.c                     |    4 ++++
 test/notest.c                   |    4 ++++
 test/wtest.c                    |    4 ++++
 util/convertfonts.c             |    4 ++++
 util/fontconv.c                 |    4 ++++
 util/geticonset.c               |    4 ++++
 util/getstyle.c                 |    4 ++++
 util/seticons.c                 |    4 ++++
 util/setstyle.c                 |    4 ++++
 util/wdread.c                   |    4 ++++
 util/wdwrite.c                  |    4 ++++
 util/wmagnify.c                 |    4 ++++
 util/wmgenmenu.c                |    4 ++++
 util/wmmenugen.c                |    4 ++++
 util/wmmenugen_misc.c           |    4 ++++
 util/wmmenugen_parse_wmconfig.c |    4 ++++
 util/wmmenugen_parse_xdg.c      |    4 ++++
 util/wxcopy.c                   |    4 ++++
 wmlib/app.c                     |    4 ++++
 wmlib/command.c                 |    4 ++++
 wmlib/event.c                   |    4 ++++
 wmlib/menu.c                    |    4 ++++
 wrlib/alpha_combine.c           |    4 ++++
 wrlib/gif.c                     |   26 +++++++++++++++++++++++---
 wrlib/tests/testdraw.c          |    4 ++++
 wrlib/tests/testgrad.c          |    4 ++++
 wrlib/tests/testrot.c           |    4 ++++
 wrlib/tests/view.c              |    4 ++++
 167 files changed, 686 insertions(+), 5 deletions(-)

Index: WindowMaker-0.95.5/WINGs/Examples/colorpick.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Examples/colorpick.c
+++ WindowMaker-0.95.5/WINGs/Examples/colorpick.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <WINGs/WINGs.h>
Index: WindowMaker-0.95.5/WINGs/Examples/fontl.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Examples/fontl.c
+++ WindowMaker-0.95.5/WINGs/Examples/fontl.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
Index: WindowMaker-0.95.5/WINGs/Examples/puzzle.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Examples/puzzle.c
+++ WindowMaker-0.95.5/WINGs/Examples/puzzle.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <WINGs/WINGs.h>
Index: WindowMaker-0.95.5/WINGs/Extras/test.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Extras/test.c
+++ WindowMaker-0.95.5/WINGs/Extras/test.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGs.h>
 #include <stdio.h>
 #include <stdint.h>
Index: WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Extras/wtabledelegates.c
+++ WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <WINGs/WINGsP.h>
 
Index: WindowMaker-0.95.5/WINGs/Extras/wtableview.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Extras/wtableview.c
+++ WindowMaker-0.95.5/WINGs/Extras/wtableview.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGsP.h>
 #include <X11/cursorfont.h>
 #include <stdint.h>
Index: WindowMaker-0.95.5/WINGs/Tests/mywidget.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Tests/mywidget.c
+++ WindowMaker-0.95.5/WINGs/Tests/mywidget.c
@@ -13,6 +13,10 @@
  *
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGsP.h>
 
 /*
Index: WindowMaker-0.95.5/WINGs/Tests/testmywidget.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Tests/testmywidget.c
+++ WindowMaker-0.95.5/WINGs/Tests/testmywidget.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGs.h>
 #include <stdlib.h>
 
Index: WindowMaker-0.95.5/WINGs/Tests/wmfile.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Tests/wmfile.c
+++ WindowMaker-0.95.5/WINGs/Tests/wmfile.c
@@ -11,6 +11,10 @@
  -----------------------------------------------------------------------
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGs.h>
 
 #include <unistd.h>
Index: WindowMaker-0.95.5/WINGs/Tests/wmquery.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Tests/wmquery.c
+++ WindowMaker-0.95.5/WINGs/Tests/wmquery.c
@@ -3,6 +3,10 @@
  * Author: Len Trigg <trigg@cs.waikato.ac.nz>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGs.h>
 
 #include <unistd.h>
Index: WindowMaker-0.95.5/WINGs/Tests/wtest.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/Tests/wtest.c
+++ WindowMaker-0.95.5/WINGs/Tests/wtest.c
@@ -2,6 +2,10 @@
  * WINGs test application
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGs.h>
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/WINGs/array.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/array.c
+++ WindowMaker-0.95.5/WINGs/array.c
@@ -8,6 +8,10 @@
  * proper credit is always appreciated :)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
Index: WindowMaker-0.95.5/WINGs/bagtree.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/bagtree.c
+++ WindowMaker-0.95.5/WINGs/bagtree.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
Index: WindowMaker-0.95.5/WINGs/configuration.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/configuration.c
+++ WindowMaker-0.95.5/WINGs/configuration.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include "wconfig.h"
 
Index: WindowMaker-0.95.5/WINGs/data.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/data.c
+++ WindowMaker-0.95.5/WINGs/data.c
@@ -19,6 +19,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include "WUtil.h"
 
Index: WindowMaker-0.95.5/WINGs/dragcommon.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/dragcommon.c
+++ WindowMaker-0.95.5/WINGs/dragcommon.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
Index: WindowMaker-0.95.5/WINGs/dragdestination.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/dragdestination.c
+++ WindowMaker-0.95.5/WINGs/dragdestination.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include <X11/Xatom.h>
 
Index: WindowMaker-0.95.5/WINGs/dragsource.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/dragsource.c
+++ WindowMaker-0.95.5/WINGs/dragsource.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 #include "WINGsP.h"
 
Index: WindowMaker-0.95.5/WINGs/error.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/error.c
+++ WindowMaker-0.95.5/WINGs/error.c
@@ -19,6 +19,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdarg.h>
Index: WindowMaker-0.95.5/WINGs/findfile.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/findfile.c
+++ WindowMaker-0.95.5/WINGs/findfile.c
@@ -19,6 +19,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include "WUtil.h"
Index: WindowMaker-0.95.5/WINGs/handlers.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/handlers.c
+++ WindowMaker-0.95.5/WINGs/handlers.c
@@ -3,6 +3,10 @@
  * WINGs internal handlers: timer, idle and input handlers
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 #include "WINGsP.h"
 
Index: WindowMaker-0.95.5/WINGs/hashtable.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/hashtable.c
+++ WindowMaker-0.95.5/WINGs/hashtable.c
@@ -1,5 +1,9 @@
 #include <config.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
Index: WindowMaker-0.95.5/WINGs/memory.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/memory.c
+++ WindowMaker-0.95.5/WINGs/memory.c
@@ -19,6 +19,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 #include "WUtil.h"
 
Index: WindowMaker-0.95.5/WINGs/misc.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/misc.c
+++ WindowMaker-0.95.5/WINGs/misc.c
@@ -1,6 +1,10 @@
 
 /* Miscelaneous helper functions */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 WMRange wmkrange(int start, int count)
Index: WindowMaker-0.95.5/WINGs/notification.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/notification.c
+++ WindowMaker-0.95.5/WINGs/notification.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
Index: WindowMaker-0.95.5/WINGs/proplist.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/proplist.c
+++ WindowMaker-0.95.5/WINGs/proplist.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/WINGs/selection.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/selection.c
+++ WindowMaker-0.95.5/WINGs/selection.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <X11/Xatom.h>
Index: WindowMaker-0.95.5/WINGs/string.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/string.c
+++ WindowMaker-0.95.5/WINGs/string.c
@@ -6,6 +6,10 @@
 #   undef _XOPEN_SOURCE
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <string.h>
Index: WindowMaker-0.95.5/WINGs/tree.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/tree.c
+++ WindowMaker-0.95.5/WINGs/tree.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 
 #include "WUtil.h"
Index: WindowMaker-0.95.5/WINGs/userdefaults.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/userdefaults.c
+++ WindowMaker-0.95.5/WINGs/userdefaults.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
Index: WindowMaker-0.95.5/WINGs/usleep.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/usleep.c
+++ WindowMaker-0.95.5/WINGs/usleep.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <time.h>
 
Index: WindowMaker-0.95.5/WINGs/wapplication.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wapplication.c
+++ WindowMaker-0.95.5/WINGs/wapplication.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <X11/Xlocale.h>
 
Index: WindowMaker-0.95.5/WINGs/wappresource.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wappresource.c
+++ WindowMaker-0.95.5/WINGs/wappresource.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 
 #include "WINGsP.h"
Index: WindowMaker-0.95.5/WINGs/wballoon.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wballoon.c
+++ WindowMaker-0.95.5/WINGs/wballoon.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 #include "WINGsP.h"
 
Index: WindowMaker-0.95.5/WINGs/wbox.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wbox.c
+++ WindowMaker-0.95.5/WINGs/wbox.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct {
Index: WindowMaker-0.95.5/WINGs/wbrowser.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wbrowser.c
+++ WindowMaker-0.95.5/WINGs/wbrowser.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include <math.h>		/* for : double rint (double) */
 
Index: WindowMaker-0.95.5/WINGs/wbutton.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wbutton.c
+++ WindowMaker-0.95.5/WINGs/wbutton.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_Button {
Index: WindowMaker-0.95.5/WINGs/wcolor.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wcolor.c
+++ WindowMaker-0.95.5/WINGs/wcolor.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #include "wconfig.h"
Index: WindowMaker-0.95.5/WINGs/wcolorpanel.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wcolorpanel.c
+++ WindowMaker-0.95.5/WINGs/wcolorpanel.c
@@ -23,6 +23,10 @@
  * 	-	Resizing
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 #include "WINGsP.h"
 #include "rgb.h"
Index: WindowMaker-0.95.5/WINGs/wcolorwell.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wcolorwell.c
+++ WindowMaker-0.95.5/WINGs/wcolorwell.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #define XDND_COLOR_DATA_TYPE "application/X-color"
Index: WindowMaker-0.95.5/WINGs/wevent.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wevent.c
+++ WindowMaker-0.95.5/WINGs/wevent.c
@@ -3,6 +3,10 @@
  * This event handling stuff was inspired on Tk.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 /* table to map event types to event masks */
Index: WindowMaker-0.95.5/WINGs/wfilepanel.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wfilepanel.c
+++ WindowMaker-0.95.5/WINGs/wfilepanel.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/WINGs/wfont.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wfont.c
+++ WindowMaker-0.95.5/WINGs/wfont.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include "wconfig.h"
Index: WindowMaker-0.95.5/WINGs/wfontpanel.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wfontpanel.c
+++ WindowMaker-0.95.5/WINGs/wfontpanel.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include "WUtil.h"
 #include "wconfig.h"
Index: WindowMaker-0.95.5/WINGs/wframe.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wframe.c
+++ WindowMaker-0.95.5/WINGs/wframe.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_Frame {
Index: WindowMaker-0.95.5/WINGs/widgets.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/widgets.c
+++ WindowMaker-0.95.5/WINGs/widgets.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include "wconfig.h"
 
Index: WindowMaker-0.95.5/WINGs/winputmethod.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/winputmethod.c
+++ WindowMaker-0.95.5/WINGs/winputmethod.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 
 #include "WINGsP.h"
Index: WindowMaker-0.95.5/WINGs/wlabel.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wlabel.c
+++ WindowMaker-0.95.5/WINGs/wlabel.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_Label {
Index: WindowMaker-0.95.5/WINGs/wlist.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wlist.c
+++ WindowMaker-0.95.5/WINGs/wlist.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 char *WMListDidScrollNotification = "WMListDidScrollNotification";
Index: WindowMaker-0.95.5/WINGs/wmenuitem.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wmenuitem.c
+++ WindowMaker-0.95.5/WINGs/wmenuitem.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_MenuItem {
Index: WindowMaker-0.95.5/WINGs/wmisc.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wmisc.c
+++ WindowMaker-0.95.5/WINGs/wmisc.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #include <wraster.h>
Index: WindowMaker-0.95.5/WINGs/wpanel.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wpanel.c
+++ WindowMaker-0.95.5/WINGs/wpanel.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #include <X11/keysym.h>
Index: WindowMaker-0.95.5/WINGs/wpixmap.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wpixmap.c
+++ WindowMaker-0.95.5/WINGs/wpixmap.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #include <wraster.h>
Index: WindowMaker-0.95.5/WINGs/wpopupbutton.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wpopupbutton.c
+++ WindowMaker-0.95.5/WINGs/wpopupbutton.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_PopUpButton {
Index: WindowMaker-0.95.5/WINGs/wprogressindicator.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wprogressindicator.c
+++ WindowMaker-0.95.5/WINGs/wprogressindicator.c
@@ -5,6 +5,10 @@
  * - centralized drawing into one pain function
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_ProgressIndicator {
Index: WindowMaker-0.95.5/WINGs/wruler.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wruler.c
+++ WindowMaker-0.95.5/WINGs/wruler.c
@@ -19,6 +19,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include "wconfig.h"
 
Index: WindowMaker-0.95.5/WINGs/wscroller.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wscroller.c
+++ WindowMaker-0.95.5/WINGs/wscroller.c
@@ -7,6 +7,10 @@
 #   undef _XOPEN_SOURCE
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #include <math.h>
Index: WindowMaker-0.95.5/WINGs/wscrollview.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wscrollview.c
+++ WindowMaker-0.95.5/WINGs/wscrollview.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_ScrollView {
Index: WindowMaker-0.95.5/WINGs/wslider.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wslider.c
+++ WindowMaker-0.95.5/WINGs/wslider.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #undef STRICT_NEXT_BEHAVIOUR
Index: WindowMaker-0.95.5/WINGs/wsplitview.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wsplitview.c
+++ WindowMaker-0.95.5/WINGs/wsplitview.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 /*
Index: WindowMaker-0.95.5/WINGs/wtabview.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wtabview.c
+++ WindowMaker-0.95.5/WINGs/wtabview.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 typedef struct W_TabView {
Index: WindowMaker-0.95.5/WINGs/wtext.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wtext.c
+++ WindowMaker-0.95.5/WINGs/wtext.c
@@ -1,6 +1,10 @@
 
 /*  WINGs WMText: multi-line/font/color/graphic text widget,  by Nwanua. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include <ctype.h>
 #include <X11/keysym.h>
Index: WindowMaker-0.95.5/WINGs/wtextfield.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wtextfield.c
+++ WindowMaker-0.95.5/WINGs/wtextfield.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 #include "wconfig.h"
 
Index: WindowMaker-0.95.5/WINGs/wutil.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wutil.c
+++ WindowMaker-0.95.5/WINGs/wutil.c
@@ -3,6 +3,10 @@
  * Handle events for non-GUI based applications
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 void WHandleEvents()
Index: WindowMaker-0.95.5/WINGs/wview.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wview.c
+++ WindowMaker-0.95.5/WINGs/wview.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WINGsP.h"
 
 #include <X11/Xresource.h>
Index: WindowMaker-0.95.5/WINGs/wwindow.c
===================================================================
--- WindowMaker-0.95.5.orig/WINGs/wwindow.c
+++ WindowMaker-0.95.5/WINGs/wwindow.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xmd.h>
 
 #include "WINGsP.h"
Index: WindowMaker-0.95.5/WPrefs.app/Appearance.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Appearance.c
+++ WindowMaker-0.95.5/WPrefs.app/Appearance.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 #include <unistd.h>
Index: WindowMaker-0.95.5/WPrefs.app/Configurations.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Configurations.c
+++ WindowMaker-0.95.5/WPrefs.app/Configurations.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/Expert.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Expert.c
+++ WindowMaker-0.95.5/WPrefs.app/Expert.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 /* This structure containts the list of all the check-buttons to display in the
Index: WindowMaker-0.95.5/WPrefs.app/Focus.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Focus.c
+++ WindowMaker-0.95.5/WPrefs.app/Focus.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/FontSimple.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/FontSimple.c
+++ WindowMaker-0.95.5/WPrefs.app/FontSimple.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 #include <unistd.h>
 #include <fontconfig/fontconfig.h>
Index: WindowMaker-0.95.5/WPrefs.app/Icons.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Icons.c
+++ WindowMaker-0.95.5/WPrefs.app/Icons.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/KeyboardSettings.c
+++ WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/Menu.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Menu.c
+++ WindowMaker-0.95.5/WPrefs.app/Menu.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 #include <assert.h>
 #include <ctype.h>
Index: WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/MenuPreferences.c
+++ WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/MouseSettings.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/MouseSettings.c
+++ WindowMaker-0.95.5/WPrefs.app/MouseSettings.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 #include <X11/Xutil.h>
Index: WindowMaker-0.95.5/WPrefs.app/Paths.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Paths.c
+++ WindowMaker-0.95.5/WPrefs.app/Paths.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 #include <unistd.h>
 #include <assert.h>
Index: WindowMaker-0.95.5/WPrefs.app/Preferences.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Preferences.c
+++ WindowMaker-0.95.5/WPrefs.app/Preferences.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/TexturePanel.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/TexturePanel.c
+++ WindowMaker-0.95.5/WPrefs.app/TexturePanel.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: WindowMaker-0.95.5/WPrefs.app/Themes.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Themes.c
+++ WindowMaker-0.95.5/WPrefs.app/Themes.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 #include <unistd.h>
Index: WindowMaker-0.95.5/WPrefs.app/WPrefs.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/WPrefs.c
+++ WindowMaker-0.95.5/WPrefs.app/WPrefs.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 #include <assert.h>
 
Index: WindowMaker-0.95.5/WPrefs.app/WindowHandling.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/WindowHandling.c
+++ WindowMaker-0.95.5/WPrefs.app/WindowHandling.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/Workspace.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/Workspace.c
+++ WindowMaker-0.95.5/WPrefs.app/Workspace.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 typedef struct _Panel {
Index: WindowMaker-0.95.5/WPrefs.app/double.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/double.c
+++ WindowMaker-0.95.5/WPrefs.app/double.c
@@ -4,6 +4,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGsP.h>
 #include "WPrefs.h"
 
Index: WindowMaker-0.95.5/WPrefs.app/editmenu.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/editmenu.c
+++ WindowMaker-0.95.5/WPrefs.app/editmenu.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGsP.h>
 #include <WINGs/WUtil.h>
 #include <stdlib.h>
Index: WindowMaker-0.95.5/WPrefs.app/main.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/main.c
+++ WindowMaker-0.95.5/WPrefs.app/main.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "WPrefs.h"
 
 #include <assert.h>
Index: WindowMaker-0.95.5/WPrefs.app/xmodifier.c
===================================================================
--- WindowMaker-0.95.5.orig/WPrefs.app/xmodifier.c
+++ WindowMaker-0.95.5/WPrefs.app/xmodifier.c
@@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301 USA. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <strings.h>
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/configure.ac
===================================================================
--- WindowMaker-0.95.5.orig/configure.ac
+++ WindowMaker-0.95.5/configure.ac
@@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by
 
 dnl Checks for programs.
 dnl ===================
-AC_ISC_POSIX
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AC_PROG_LN_S
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_LIBTOOL
Index: WindowMaker-0.95.5/src/actions.c
===================================================================
--- WindowMaker-0.95.5.orig/src/actions.c
+++ WindowMaker-0.95.5/src/actions.c
@@ -20,6 +20,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/appicon.c
===================================================================
--- WindowMaker-0.95.5.orig/src/appicon.c
+++ WindowMaker-0.95.5/src/appicon.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/application.c
===================================================================
--- WindowMaker-0.95.5.orig/src/application.c
+++ WindowMaker-0.95.5/src/application.c
@@ -18,6 +18,10 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/appmenu.c
===================================================================
--- WindowMaker-0.95.5.orig/src/appmenu.c
+++ WindowMaker-0.95.5/src/appmenu.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/balloon.c
===================================================================
--- WindowMaker-0.95.5.orig/src/balloon.c
+++ WindowMaker-0.95.5/src/balloon.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #ifdef BALLOON_TEXT
Index: WindowMaker-0.95.5/src/client.c
===================================================================
--- WindowMaker-0.95.5.orig/src/client.c
+++ WindowMaker-0.95.5/src/client.c
@@ -17,6 +17,10 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/colormap.c
===================================================================
--- WindowMaker-0.95.5.orig/src/colormap.c
+++ WindowMaker-0.95.5/src/colormap.c
@@ -23,6 +23,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include "WindowMaker.h"
Index: WindowMaker-0.95.5/src/cycling.c
===================================================================
--- WindowMaker-0.95.5.orig/src/cycling.c
+++ WindowMaker-0.95.5/src/cycling.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdlib.h>
Index: WindowMaker-0.95.5/src/defaults.c
===================================================================
--- WindowMaker-0.95.5.orig/src/defaults.c
+++ WindowMaker-0.95.5/src/defaults.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/dialog.c
===================================================================
--- WindowMaker-0.95.5.orig/src/dialog.c
+++ WindowMaker-0.95.5/src/dialog.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/dock.c
===================================================================
--- WindowMaker-0.95.5.orig/src/dock.c
+++ WindowMaker-0.95.5/src/dock.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/dockedapp.c
===================================================================
--- WindowMaker-0.95.5.orig/src/dockedapp.c
+++ WindowMaker-0.95.5/src/dockedapp.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/event.c
===================================================================
--- WindowMaker-0.95.5.orig/src/event.c
+++ WindowMaker-0.95.5/src/event.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #ifdef HAVE_INOTIFY
Index: WindowMaker-0.95.5/src/framewin.c
===================================================================
--- WindowMaker-0.95.5.orig/src/framewin.c
+++ WindowMaker-0.95.5/src/framewin.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/geomview.c
===================================================================
--- WindowMaker-0.95.5.orig/src/geomview.c
+++ WindowMaker-0.95.5/src/geomview.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <WINGs/WINGsP.h>
 
 #include "geomview.h"
Index: WindowMaker-0.95.5/src/icon.c
===================================================================
--- WindowMaker-0.95.5.orig/src/icon.c
+++ WindowMaker-0.95.5/src/icon.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/main.c
===================================================================
--- WindowMaker-0.95.5.orig/src/main.c
+++ WindowMaker-0.95.5/src/main.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #ifdef HAVE_INOTIFY
Index: WindowMaker-0.95.5/src/menu.c
===================================================================
--- WindowMaker-0.95.5.orig/src/menu.c
+++ WindowMaker-0.95.5/src/menu.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/misc.c
===================================================================
--- WindowMaker-0.95.5.orig/src/misc.c
+++ WindowMaker-0.95.5/src/misc.c
@@ -17,6 +17,10 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/monitor.c
===================================================================
--- WindowMaker-0.95.5.orig/src/monitor.c
+++ WindowMaker-0.95.5/src/monitor.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 #include <unistd.h>
 #include <stdlib.h>
Index: WindowMaker-0.95.5/src/motif.c
===================================================================
--- WindowMaker-0.95.5.orig/src/motif.c
+++ WindowMaker-0.95.5/src/motif.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #ifdef MWM_HINTS
Index: WindowMaker-0.95.5/src/moveres.c
===================================================================
--- WindowMaker-0.95.5.orig/src/moveres.c
+++ WindowMaker-0.95.5/src/moveres.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/osdep_bsd.c
===================================================================
--- WindowMaker-0.95.5.orig/src/osdep_bsd.c
+++ WindowMaker-0.95.5/src/osdep_bsd.c
@@ -11,6 +11,10 @@
 #else /* OPENBSD || NETBSD */
 #   include <sys/param.h>
 #endif
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/sysctl.h>
 
 #include <assert.h>
Index: WindowMaker-0.95.5/src/osdep_darwin.c
===================================================================
--- WindowMaker-0.95.5.orig/src/osdep_darwin.c
+++ WindowMaker-0.95.5/src/osdep_darwin.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
Index: WindowMaker-0.95.5/src/osdep_linux.c
===================================================================
--- WindowMaker-0.95.5.orig/src/osdep_linux.c
+++ WindowMaker-0.95.5/src/osdep_linux.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/src/osdep_stub.c
===================================================================
--- WindowMaker-0.95.5.orig/src/osdep_stub.c
+++ WindowMaker-0.95.5/src/osdep_stub.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/utsname.h>
 
 #include <WINGs/WUtil.h>
Index: WindowMaker-0.95.5/src/pixmap.c
===================================================================
--- WindowMaker-0.95.5.orig/src/pixmap.c
+++ WindowMaker-0.95.5/src/pixmap.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/placement.c
===================================================================
--- WindowMaker-0.95.5.orig/src/placement.c
+++ WindowMaker-0.95.5/src/placement.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/properties.c
===================================================================
--- WindowMaker-0.95.5.orig/src/properties.c
+++ WindowMaker-0.95.5/src/properties.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/resources.c
===================================================================
--- WindowMaker-0.95.5.orig/src/resources.c
+++ WindowMaker-0.95.5/src/resources.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/rootmenu.c
===================================================================
--- WindowMaker-0.95.5.orig/src/rootmenu.c
+++ WindowMaker-0.95.5/src/rootmenu.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/screen.c
===================================================================
--- WindowMaker-0.95.5.orig/src/screen.c
+++ WindowMaker-0.95.5/src/screen.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/session.c
===================================================================
--- WindowMaker-0.95.5.orig/src/session.c
+++ WindowMaker-0.95.5/src/session.c
@@ -57,6 +57,10 @@
  * if the Die message is received, exit.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/shutdown.c
===================================================================
--- WindowMaker-0.95.5.orig/src/shutdown.c
+++ WindowMaker-0.95.5/src/shutdown.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdlib.h>
Index: WindowMaker-0.95.5/src/stacking.c
===================================================================
--- WindowMaker-0.95.5.orig/src/stacking.c
+++ WindowMaker-0.95.5/src/stacking.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/startup.c
===================================================================
--- WindowMaker-0.95.5.orig/src/startup.c
+++ WindowMaker-0.95.5/src/startup.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/superfluous.c
===================================================================
--- WindowMaker-0.95.5.orig/src/superfluous.c
+++ WindowMaker-0.95.5/src/superfluous.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/switchmenu.c
===================================================================
--- WindowMaker-0.95.5.orig/src/switchmenu.c
+++ WindowMaker-0.95.5/src/switchmenu.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/switchpanel.c
===================================================================
--- WindowMaker-0.95.5.orig/src/switchpanel.c
+++ WindowMaker-0.95.5/src/switchpanel.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdint.h>
Index: WindowMaker-0.95.5/src/texture.c
===================================================================
--- WindowMaker-0.95.5.orig/src/texture.c
+++ WindowMaker-0.95.5/src/texture.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/usermenu.c
===================================================================
--- WindowMaker-0.95.5.orig/src/usermenu.c
+++ WindowMaker-0.95.5/src/usermenu.c
@@ -56,6 +56,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #ifdef USER_MENU
Index: WindowMaker-0.95.5/src/wcore.c
===================================================================
--- WindowMaker-0.95.5.orig/src/wcore.c
+++ WindowMaker-0.95.5/src/wcore.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/wdefaults.c
===================================================================
--- WindowMaker-0.95.5.orig/src/wdefaults.c
+++ WindowMaker-0.95.5/src/wdefaults.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/window.c
===================================================================
--- WindowMaker-0.95.5.orig/src/window.c
+++ WindowMaker-0.95.5/src/window.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/winmenu.c
===================================================================
--- WindowMaker-0.95.5.orig/src/winmenu.c
+++ WindowMaker-0.95.5/src/winmenu.c
@@ -19,6 +19,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <stdio.h>
Index: WindowMaker-0.95.5/src/winspector.c
===================================================================
--- WindowMaker-0.95.5.orig/src/winspector.c
+++ WindowMaker-0.95.5/src/winspector.c
@@ -20,6 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/wmspec.c
===================================================================
--- WindowMaker-0.95.5.orig/src/wmspec.c
+++ WindowMaker-0.95.5/src/wmspec.c
@@ -28,6 +28,10 @@
  * return to be Success is not enough. -Dan
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/workspace.c
===================================================================
--- WindowMaker-0.95.5.orig/src/workspace.c
+++ WindowMaker-0.95.5/src/workspace.c
@@ -18,6 +18,10 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/src/xdnd.c
===================================================================
--- WindowMaker-0.95.5.orig/src/xdnd.c
+++ WindowMaker-0.95.5/src/xdnd.c
@@ -1,5 +1,9 @@
 /* Many part of code are ripped of an example from JX's site */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #ifdef XDND
Index: WindowMaker-0.95.5/src/xinerama.c
===================================================================
--- WindowMaker-0.95.5.orig/src/xinerama.c
+++ WindowMaker-0.95.5/src/xinerama.c
@@ -18,6 +18,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include "xinerama.h"
Index: WindowMaker-0.95.5/src/xmodifier.c
===================================================================
--- WindowMaker-0.95.5.orig/src/xmodifier.c
+++ WindowMaker-0.95.5/src/xmodifier.c
@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301 USA. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wconfig.h"
 
 #include <string.h>
Index: WindowMaker-0.95.5/src/xutil.c
===================================================================
--- WindowMaker-0.95.5.orig/src/xutil.c
+++ WindowMaker-0.95.5/src/xutil.c
@@ -19,6 +19,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <stdlib.h>
 #include <X11/Xutil.h>
Index: WindowMaker-0.95.5/test/notest.c
===================================================================
--- WindowMaker-0.95.5.orig/test/notest.c
+++ WindowMaker-0.95.5/test/notest.c
@@ -3,6 +3,10 @@
  * TODO: remake
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
Index: WindowMaker-0.95.5/test/wtest.c
===================================================================
--- WindowMaker-0.95.5.orig/test/wtest.c
+++ WindowMaker-0.95.5/test/wtest.c
@@ -8,6 +8,10 @@
  * TODO: remake
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/util/convertfonts.c
===================================================================
--- WindowMaker-0.95.5.orig/util/convertfonts.c
+++ WindowMaker-0.95.5/util/convertfonts.c
@@ -23,6 +23,10 @@
 #define _GNU_SOURCE		/* getopt_long */
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/stat.h>
 
 #include <getopt.h>
Index: WindowMaker-0.95.5/util/fontconv.c
===================================================================
--- WindowMaker-0.95.5.orig/util/fontconv.c
+++ WindowMaker-0.95.5/util/fontconv.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: WindowMaker-0.95.5/util/geticonset.c
===================================================================
--- WindowMaker-0.95.5.orig/util/geticonset.c
+++ WindowMaker-0.95.5/util/geticonset.c
@@ -23,6 +23,10 @@
 #define _GNU_SOURCE		/* getopt_long */
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: WindowMaker-0.95.5/util/getstyle.c
===================================================================
--- WindowMaker-0.95.5.orig/util/getstyle.c
+++ WindowMaker-0.95.5/util/getstyle.c
@@ -23,6 +23,10 @@
 #define _GNU_SOURCE		/* getopt_long */
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/util/seticons.c
===================================================================
--- WindowMaker-0.95.5.orig/util/seticons.c
+++ WindowMaker-0.95.5/util/seticons.c
@@ -23,6 +23,10 @@
 #define _GNU_SOURCE		/* getopt_long */
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: WindowMaker-0.95.5/util/setstyle.c
===================================================================
--- WindowMaker-0.95.5.orig/util/setstyle.c
+++ WindowMaker-0.95.5/util/setstyle.c
@@ -23,6 +23,10 @@
 #define _GNU_SOURCE		/* getopt_long */
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/stat.h>
 
 #include <getopt.h>
Index: WindowMaker-0.95.5/util/wdread.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wdread.c
+++ WindowMaker-0.95.5/util/wdread.c
@@ -28,6 +28,10 @@
  * WindowMaker defaults DB reader
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
Index: WindowMaker-0.95.5/util/wdwrite.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wdwrite.c
+++ WindowMaker-0.95.5/util/wdwrite.c
@@ -28,6 +28,10 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
Index: WindowMaker-0.95.5/util/wmagnify.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wmagnify.c
+++ WindowMaker-0.95.5/util/wmagnify.c
@@ -7,6 +7,10 @@
  */
 #include <config.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xproto.h>
 
 #include <WINGs/WINGs.h>
Index: WindowMaker-0.95.5/util/wmgenmenu.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wmgenmenu.c
+++ WindowMaker-0.95.5/util/wmgenmenu.c
@@ -4,6 +4,10 @@
 #define _GNU_SOURCE		/* getopt_long */
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <getopt.h>
 #include <limits.h>
Index: WindowMaker-0.95.5/util/wmmenugen.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wmmenugen.c
+++ WindowMaker-0.95.5/util/wmmenugen.c
@@ -18,6 +18,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/util/wmmenugen_misc.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wmmenugen_misc.c
+++ WindowMaker-0.95.5/util/wmmenugen_misc.c
@@ -20,6 +20,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <libgen.h>
 #include <stdlib.h>
 #include <string.h>
Index: WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wmmenugen_parse_wmconfig.c
+++ WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c
@@ -20,6 +20,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wmmenugen_parse_xdg.c
+++ WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c
@@ -36,6 +36,10 @@
  * Basic validation of the .desktop file is done.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
Index: WindowMaker-0.95.5/util/wxcopy.c
===================================================================
--- WindowMaker-0.95.5.orig/util/wxcopy.c
+++ WindowMaker-0.95.5/util/wxcopy.c
@@ -18,6 +18,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: WindowMaker-0.95.5/wmlib/app.c
===================================================================
--- WindowMaker-0.95.5.orig/wmlib/app.c
+++ WindowMaker-0.95.5/wmlib/app.c
@@ -20,6 +20,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <stdlib.h>
 #include <string.h>
Index: WindowMaker-0.95.5/wmlib/command.c
===================================================================
--- WindowMaker-0.95.5.orig/wmlib/command.c
+++ WindowMaker-0.95.5/wmlib/command.c
@@ -20,6 +20,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <stdlib.h>
 
Index: WindowMaker-0.95.5/wmlib/event.c
===================================================================
--- WindowMaker-0.95.5.orig/wmlib/event.c
+++ WindowMaker-0.95.5/wmlib/event.c
@@ -20,6 +20,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <X11/Xlib.h>
Index: WindowMaker-0.95.5/wmlib/menu.c
===================================================================
--- WindowMaker-0.95.5.orig/wmlib/menu.c
+++ WindowMaker-0.95.5/wmlib/menu.c
@@ -20,6 +20,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
Index: WindowMaker-0.95.5/wrlib/alpha_combine.c
===================================================================
--- WindowMaker-0.95.5.orig/wrlib/alpha_combine.c
+++ WindowMaker-0.95.5/wrlib/alpha_combine.c
@@ -18,6 +18,10 @@
  *  MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wraster.h"
 
 void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha,
Index: WindowMaker-0.95.5/wrlib/gif.c
===================================================================
--- WindowMaker-0.95.5.orig/wrlib/gif.c
+++ WindowMaker-0.95.5/wrlib/gif.c
@@ -52,17 +52,24 @@ RImage *RLoadGIF(const char *file, int i
 	unsigned char rmap[256];
 	unsigned char gmap[256];
 	unsigned char bmap[256];
+    int dgiferr;
 
 	if (index < 0)
 		index = 0;
 
 	/* default error message */
 	RErrorCode = RERR_BADINDEX;
-
+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
+    gif = DGifOpenFileName(file, &dgiferr);
+#else
 	gif = DGifOpenFileName(file);
-
+#endif
 	if (!gif) {
+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
+        switch (dgiferr) {
+#else
 		switch (GifLastError()) {
+#endif
 		case D_GIF_ERR_OPEN_FAILED:
 			RErrorCode = RERR_OPEN;
 			break;
@@ -77,7 +84,11 @@ RImage *RLoadGIF(const char *file, int i
 	}
 
 	if (gif->SWidth < 1 || gif->SHeight < 1) {
+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5)
+		DGifCloseFile(gif, NULL);
+#else
 		DGifCloseFile(gif);
+#endif
 		RErrorCode = RERR_BADIMAGEFILE;
 		return NULL;
 	}
@@ -199,7 +210,11 @@ RImage *RLoadGIF(const char *file, int i
 	/* yuck! */
 	goto did_not_get_any_errors;
  giferr:
+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
+    switch (gif->Error) {
+#else
 	switch (GifLastError()) {
+#endif
 	case D_GIF_ERR_OPEN_FAILED:
 		RErrorCode = RERR_OPEN;
 		break;
@@ -219,8 +234,13 @@ RImage *RLoadGIF(const char *file, int i
 	if (buffer)
 		free(buffer);
 
-	if (gif)
+	if (gif) {
+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5)
+		DGifCloseFile(gif, NULL);
+#else
 		DGifCloseFile(gif);
+#endif
+	}
 
 	return image;
 }
Index: WindowMaker-0.95.5/wrlib/tests/testdraw.c
===================================================================
--- WindowMaker-0.95.5.orig/wrlib/tests/testdraw.c
+++ WindowMaker-0.95.5/wrlib/tests/testdraw.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include "wraster.h"
 #include <stdio.h>
Index: WindowMaker-0.95.5/wrlib/tests/testgrad.c
===================================================================
--- WindowMaker-0.95.5.orig/wrlib/tests/testgrad.c
+++ WindowMaker-0.95.5/wrlib/tests/testgrad.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include "wraster.h"
 #include <stdio.h>
Index: WindowMaker-0.95.5/wrlib/tests/testrot.c
===================================================================
--- WindowMaker-0.95.5.orig/wrlib/tests/testrot.c
+++ WindowMaker-0.95.5/wrlib/tests/testrot.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include "wraster.h"
 #include <stdlib.h>
Index: WindowMaker-0.95.5/wrlib/tests/view.c
===================================================================
--- WindowMaker-0.95.5.orig/wrlib/tests/view.c
+++ WindowMaker-0.95.5/wrlib/tests/view.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include "wraster.h"
 #include <stdlib.h>