This commit is contained in:
Dana Jansens 2002-12-18 15:49:41 +00:00
parent 104ccc5786
commit f4e2fc3274
2 changed files with 11 additions and 3 deletions

View file

@ -185,6 +185,14 @@ CPPFLAGS=$OLDCPPFLAGS
AC_SUBST([XFT_CFLAGS]) AC_SUBST([XFT_CFLAGS])
AC_SUBST([XFT_LIBS]) 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 dnl Check for XShape extension support
AC_CHECK_LIB([Xext], [XShapeCombineShape], AC_CHECK_LIB([Xext], [XShapeCombineShape],
AC_MSG_CHECKING([for X11/extensions/shape.h]) AC_MSG_CHECKING([for X11/extensions/shape.h])

View file

@ -2,12 +2,12 @@ localedir=$(datadir)/locale
DEFAULT_MENU=$(pkgdatadir)/menu DEFAULT_MENU=$(pkgdatadir)/menu
DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ \ CPPFLAGS=$(XFT_CFLAGS) $(GUILE_CFLAGS) @CPPFLAGS@ \
-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
-DLOCALEDIR=\"$(localedir)\" -DLOCALEDIR=\"$(localedir)\"
LIBS=$(XFT_LIBS) @LIBS@ LIBS=$(XFT_LIBS) $(GUILE_LDFLAGS) @LIBS@
INCLUDES= -I../otk INCLUDES= -I../otk