diff --git a/WindowMaker.changes b/WindowMaker.changes index 95b3ce1..6153dd2 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 8 02:32:01 UTC 2013 - crrodriguez@opensuse.org + +- wm-giflib.patch --> fix build with newer giflib + (stuff must also _always_ include "config.h" as the first file) + ------------------------------------------------------------------- Tue Sep 18 11:48:57 UTC 2012 - chris@computersalat.de diff --git a/WindowMaker.spec b/WindowMaker.spec index 6ef144c..022e886 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -1,7 +1,7 @@ # # spec file for package WindowMaker # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: WindowMaker Summary: A Colorful and Flexible Window Manager -License: GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain +License: GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain Group: System/GUI/Other Version: 0.95.3 Release: 0 @@ -36,6 +36,7 @@ Patch2: %{name}-menu.patch ## git diff wmaker-0.95.3..81eefca4e Patch100: %{name}-81eefca4e.patch # +Patch101: wm-giflib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fontconfig-devel BuildRequires: freetype2-devel @@ -94,6 +95,7 @@ cp %{name}/{menu.*,plmenu.*} menu_orig %patch1 %patch2 %patch100 +%patch101 cp %{S:4} . cp %{S:6} . %if 0%{?suse_version} < 1140 diff --git a/wm-giflib.patch b/wm-giflib.patch new file mode 100644 index 0000000..e78d2f8 --- /dev/null +++ b/wm-giflib.patch @@ -0,0 +1,2088 @@ +--- WINGs/Examples/colorpick.c.orig ++++ WINGs/Examples/colorpick.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/Examples/fontl.c.orig ++++ 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 + #include + #include +--- WINGs/Examples/puzzle.c.orig ++++ WINGs/Examples/puzzle.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/Extras/test.c.orig ++++ WINGs/Extras/test.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/Extras/wtabledelegates.c.orig ++++ WINGs/Extras/wtabledelegates.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/Extras/wtableview.c.orig ++++ WINGs/Extras/wtableview.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/Tests/mywidget.c.orig ++++ WINGs/Tests/mywidget.c +@@ -13,6 +13,10 @@ + * + * + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + /* +--- WINGs/Tests/testmywidget.c.orig ++++ WINGs/Tests/testmywidget.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/Tests/wmfile.c.orig ++++ WINGs/Tests/wmfile.c +@@ -11,6 +11,10 @@ + ----------------------------------------------------------------------- + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- WINGs/Tests/wmquery.c.orig ++++ WINGs/Tests/wmquery.c +@@ -3,6 +3,10 @@ + * Author: Len Trigg + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- WINGs/Tests/wtest.c.orig ++++ WINGs/Tests/wtest.c +@@ -2,6 +2,10 @@ + * WINGs test application + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- WINGs/array.c.orig ++++ WINGs/array.c +@@ -8,6 +8,10 @@ + * proper credit is always appreciated :) + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/bagtree.c.orig ++++ WINGs/bagtree.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/configuration.c.orig ++++ WINGs/configuration.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +--- WINGs/data.c.orig ++++ WINGs/data.c +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include "WUtil.h" + +--- WINGs/dragcommon.c.orig ++++ 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 +--- WINGs/dragdestination.c.orig ++++ WINGs/dragdestination.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include + +--- WINGs/dragsource.c.orig ++++ WINGs/dragsource.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +--- WINGs/error.c.orig ++++ WINGs/error.c +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include +--- WINGs/findfile.c.orig ++++ WINGs/findfile.c +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WUtil.h" +--- WINGs/handlers.c.orig ++++ 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" + +--- WINGs/hashtable.c.orig ++++ WINGs/hashtable.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/memory.c.orig ++++ WINGs/memory.c +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WUtil.h" + +--- WINGs/misc.c.orig ++++ 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) +--- WINGs/notification.c.orig ++++ WINGs/notification.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/proplist.c.orig ++++ WINGs/proplist.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/selection.c.orig ++++ WINGs/selection.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- WINGs/string.c.orig ++++ WINGs/string.c +@@ -6,6 +6,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include +--- WINGs/tree.c.orig ++++ WINGs/tree.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include "WUtil.h" +--- WINGs/userdefaults.c.orig ++++ WINGs/userdefaults.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- WINGs/usleep.c.orig ++++ WINGs/usleep.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/wapplication.c.orig ++++ WINGs/wapplication.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/wappresource.c.orig ++++ WINGs/wappresource.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include "WINGsP.h" +--- WINGs/wballoon.c.orig ++++ WINGs/wballoon.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +--- WINGs/wbox.c.orig ++++ WINGs/wbox.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct { +--- WINGs/wbrowser.c.orig ++++ WINGs/wbrowser.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include /* for : double rint (double) */ + +--- WINGs/wbutton.c.orig ++++ WINGs/wbutton.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Button { +--- WINGs/wcolor.c.orig ++++ WINGs/wcolor.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include "wconfig.h" +--- WINGs/wcolorpanel.c.orig ++++ 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" +--- WINGs/wcolorwell.c.orig ++++ 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" +--- WINGs/wevent.c.orig ++++ 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 */ +--- WINGs/wfilepanel.c.orig ++++ WINGs/wfilepanel.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- WINGs/wfont.c.orig ++++ WINGs/wfont.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include "wconfig.h" +--- WINGs/wfontpanel.c.orig ++++ WINGs/wfontpanel.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "WUtil.h" + #include "wconfig.h" +--- WINGs/wframe.c.orig ++++ WINGs/wframe.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Frame { +--- WINGs/widgets.c.orig ++++ WINGs/widgets.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +--- WINGs/winputmethod.c.orig ++++ WINGs/winputmethod.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include "WINGsP.h" +--- WINGs/wlabel.c.orig ++++ WINGs/wlabel.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Label { +--- WINGs/wlist.c.orig ++++ WINGs/wlist.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + char *WMListDidScrollNotification = "WMListDidScrollNotification"; +--- WINGs/wmenuitem.c.orig ++++ WINGs/wmenuitem.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_MenuItem { +--- WINGs/wmisc.c.orig ++++ WINGs/wmisc.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include +--- WINGs/wpanel.c.orig ++++ WINGs/wpanel.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include +--- WINGs/wpixmap.c.orig ++++ WINGs/wpixmap.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include +--- WINGs/wpopupbutton.c.orig ++++ WINGs/wpopupbutton.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_PopUpButton { +--- WINGs/wprogressindicator.c.orig ++++ 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 { +--- WINGs/wruler.c.orig ++++ WINGs/wruler.c +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +--- WINGs/wscroller.c.orig ++++ WINGs/wscroller.c +@@ -7,6 +7,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include +--- WINGs/wscrollview.c.orig ++++ WINGs/wscrollview.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ScrollView { +--- WINGs/wslider.c.orig ++++ WINGs/wslider.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #undef STRICT_NEXT_BEHAVIOUR +--- WINGs/wsplitview.c.orig ++++ WINGs/wsplitview.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* +--- WINGs/wtabview.c.orig ++++ WINGs/wtabview.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_TabView { +--- WINGs/wtext.c.orig ++++ 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 + #include +--- WINGs/wtextfield.c.orig ++++ WINGs/wtextfield.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +--- WINGs/wutil.c.orig ++++ 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() +--- WINGs/wview.c.orig ++++ WINGs/wview.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include +--- WINGs/wwindow.c.orig ++++ WINGs/wwindow.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include "WINGsP.h" +--- WPrefs.app/Appearance.c.orig ++++ 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 +--- WPrefs.app/Configurations.c.orig ++++ 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 { +--- WPrefs.app/Expert.c.orig ++++ 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" + + typedef struct _Panel { +--- WPrefs.app/Focus.c.orig ++++ 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 { +--- WPrefs.app/FontSimple.c.orig ++++ 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 + #include +--- WPrefs.app/Icons.c.orig ++++ 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 { +--- WPrefs.app/KeyboardSettings.c.orig ++++ 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 { +--- WPrefs.app/Menu.c.orig ++++ 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 + #include +--- WPrefs.app/MenuPreferences.c.orig ++++ 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 { +--- WPrefs.app/MouseSettings.c.orig ++++ 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 +--- WPrefs.app/Paths.c.orig ++++ 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 + #include +--- WPrefs.app/Preferences.c.orig ++++ 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 { +--- WPrefs.app/TexturePanel.c.orig ++++ 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 + #include + #include +--- WPrefs.app/Themes.c.orig ++++ 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 +--- WPrefs.app/WPrefs.c.orig ++++ 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 + +--- WPrefs.app/WindowHandling.c.orig ++++ 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 { +--- WPrefs.app/Workspace.c.orig ++++ 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 { +--- WPrefs.app/double.c.orig ++++ WPrefs.app/double.c +@@ -4,6 +4,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include "double.h" +--- WPrefs.app/editmenu.c.orig ++++ 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 + #include + #include +--- WPrefs.app/main.c.orig ++++ 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 +--- WPrefs.app/xmodifier.c.orig ++++ WPrefs.app/xmodifier.c +@@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph + #include + #include +--- src/actions.c.orig ++++ 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 +--- src/appicon.c.orig ++++ 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 +--- src/application.c.orig ++++ 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 +--- src/appmenu.c.orig ++++ 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 +--- src/balloon.c.orig ++++ 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 +--- src/client.c.orig ++++ 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 +--- src/colormap.c.orig ++++ 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" +--- src/cycling.c.orig ++++ 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 +--- src/defaults.c.orig ++++ 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 +--- src/dialog.c.orig ++++ 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 +--- src/dock.c.orig ++++ 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 +--- src/dockedapp.c.orig ++++ 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 +--- src/event.c.orig ++++ 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 +--- src/framewin.c.orig ++++ 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 +--- src/geomview.c.orig ++++ src/geomview.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + typedef struct W_GeometryView { +--- src/icon.c.orig ++++ 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 +--- src/main.c.orig ++++ 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 +--- src/menu.c.orig ++++ 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 +--- src/misc.c.orig ++++ 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 +--- src/monitor.c.orig ++++ 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 + #include +--- src/motif.c.orig ++++ 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 +--- src/moveres.c.orig ++++ 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 +--- src/osdep_bsd.c.orig ++++ src/osdep_bsd.c +@@ -11,6 +11,10 @@ + #else /* OPENBSD || NETBSD */ + # include + #endif ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- src/osdep_darwin.c.orig ++++ src/osdep_darwin.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- src/osdep_linux.c.orig ++++ src/osdep_linux.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- src/osdep_stub.c.orig ++++ src/osdep_stub.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- src/pixmap.c.orig ++++ 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 +--- src/placement.c.orig ++++ 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 +--- src/properties.c.orig ++++ 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 +--- src/resources.c.orig ++++ 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 +--- src/rootmenu.c.orig ++++ 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 +--- src/screen.c.orig ++++ 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 +--- src/session.c.orig ++++ 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 +--- src/shutdown.c.orig ++++ 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 +--- src/stacking.c.orig ++++ 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 +--- src/startup.c.orig ++++ 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 +--- src/superfluous.c.orig ++++ 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 +--- src/switchmenu.c.orig ++++ 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 +--- src/switchpanel.c.orig ++++ 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 +--- src/texture.c.orig ++++ 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 +--- src/usermenu.c.orig ++++ src/usermenu.c +@@ -56,6 +56,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef USER_MENU +--- src/wcore.c.orig ++++ 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 +--- src/wdefaults.c.orig ++++ 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 +--- src/window.c.orig ++++ 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 +--- src/winmenu.c.orig ++++ 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 +--- src/winspector.c.orig ++++ 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 +--- src/wmspec.c.orig ++++ 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 +--- src/workspace.c.orig ++++ 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 +--- src/xdnd.c.orig ++++ 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 +--- src/xinerama.c.orig ++++ 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" +--- src/xmodifier.c.orig ++++ src/xmodifier.c +@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph +--- src/xutil.c.orig ++++ src/xutil.c +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- test/notest.c.orig ++++ test/notest.c +@@ -3,6 +3,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- test/wtest.c.orig ++++ test/wtest.c +@@ -8,6 +8,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/convertfonts.c.orig ++++ util/convertfonts.c +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- util/fontconv.c.orig ++++ util/fontconv.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/geticonset.c.orig ++++ util/geticonset.c +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/getstyle.c.orig ++++ util/getstyle.c +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- util/seticons.c.orig ++++ util/seticons.c +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/setstyle.c.orig ++++ util/setstyle.c +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- util/wdread.c.orig ++++ util/wdread.c +@@ -28,6 +28,10 @@ + * WindowMaker defaults DB reader + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/wdwrite.c.orig ++++ util/wdwrite.c +@@ -28,6 +28,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/wmagnify.c.orig ++++ util/wmagnify.c +@@ -6,6 +6,10 @@ + * This program is in the Public Domain. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +--- util/wmgenmenu.c.orig ++++ util/wmgenmenu.c +@@ -4,6 +4,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- util/wmmenugen.c.orig ++++ 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 + #include + +--- util/wmmenugen_misc.c.orig ++++ 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 + #include + #include +--- util/wmmenugen_parse_wmconfig.c.orig ++++ 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 + #include + +--- util/wmmenugen_parse_xdg.c.orig ++++ 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 + #include + +--- util/wxcopy.c.orig ++++ util/wxcopy.c +@@ -17,6 +17,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- wmlib/app.c.orig ++++ wmlib/app.c +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- wmlib/command.c.orig ++++ wmlib/command.c +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + +--- wmlib/event.c.orig ++++ wmlib/event.c +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- wmlib/menu.c.orig ++++ wmlib/menu.c +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include +--- wrlib/alpha_combine.c.orig ++++ wrlib/alpha_combine.c +@@ -17,6 +17,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wraster.h" + + void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, +--- wrlib/tests/testdraw.c.orig ++++ wrlib/tests/testdraw.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include "wraster.h" + #include +--- wrlib/tests/testgrad.c.orig ++++ wrlib/tests/testgrad.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include "wraster.h" + #include +--- wrlib/tests/testrot.c.orig ++++ wrlib/tests/testrot.c +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include "wraster.h" + #include +--- wrlib/tests/view.c.orig ++++ wrlib/tests/view.c +@@ -1,3 +1,7 @@ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include "wraster.h" + #include +--- configure.ac.orig ++++ 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 +--- wrlib/gif.c.orig ++++ wrlib/gif.c +@@ -50,17 +50,24 @@ RImage *RLoadGIF(char *file, int index) + 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; +@@ -197,7 +204,11 @@ RImage *RLoadGIF(char *file, int index) + /* 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;