diff options
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/menus.c | 4 | ||||
-rw-r--r-- | src/twm.h | 4 |
4 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6f1cef7..fc63127 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AC_INIT([twm], [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [twm]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/src/Makefile.am b/src/Makefile.am index cb6f615..cfd0b44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ bin_PROGRAMS = twm rcdir = ${datadir}/X11/twm dist_rc_DATA = system.twmrc -AM_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE +AM_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" AM_CFLAGS += -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\" twm_LDADD = $(TWM_LIBS) diff --git a/src/menus.c b/src/menus.c index 8d21644..bc688e6 100644 --- a/src/menus.c +++ b/src/menus.c @@ -58,6 +58,10 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <X11/Xos.h> #include "twm.h" @@ -62,6 +62,10 @@ from The Open Group. #ifndef _TWM_ #define _TWM_ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/cursorfont.h> |