guileize
Dana Jansens danakj@orodu.net
2 files changed,
11 insertions(+),
3 deletions(-)
M
configure.ac
→
configure.ac
@@ -185,6 +185,14 @@
AC_SUBST([XFT_CFLAGS]) AC_SUBST([XFT_LIBS]) +dnl Check for Guile +GUILE_FLAGS +if ! test "$GUILE_CFLAGS" && ! test "$GUILE_LDFLAGS"; then + AC_MSG_ERROR([Openbox requires the Guile language to be installed. +See http://www.gnu.org/software/guile/ . +]) +fi + dnl Check for XShape extension support AC_CHECK_LIB([Xext], [XShapeCombineShape], AC_MSG_CHECKING([for X11/extensions/shape.h])@@ -289,4 +297,4 @@ AC_MSG_RESULT([Building with '$CPPFLAGS' for C++ compiler flags.])
AC_MSG_RESULT([Building with '$LIBS' for linker flags.]) AC_MSG_RESULT AC_MSG_RESULT([configure complete, now type \"make\"]) -AC_MSG_RESULT+AC_MSG_RESULT
M
src/Makefile.am
→
src/Makefile.am
@@ -2,12 +2,12 @@ localedir=$(datadir)/locale
DEFAULT_MENU=$(pkgdatadir)/menu DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex -CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) $(GUILE_CFLAGS) @CPPFLAGS@ \ -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ -DLOCALEDIR=\"$(localedir)\" -LIBS=$(XFT_LIBS) @LIBS@ +LIBS=$(XFT_LIBS) $(GUILE_LDFLAGS) @LIBS@ INCLUDES= -I../otk