build fixes for finding Xlibs and for setting vars based on found Xlib info and Xinerama info
Dana Jansens danakj@orodu.net
4 files changed,
54 insertions(+),
9 deletions(-)
M
build/Makefile.incl.in
→
build/Makefile.incl.in
@@ -22,6 +22,10 @@
GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ -DG_DISABLE_DEPRECATED +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ +XINERAMA_LIBS = @XINERAMA_LIBS@ + XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@
M
build/Makefile.kernel
→
build/Makefile.kernel
@@ -2,9 +2,9 @@ include build/Makefile.incl
dir = kernel -CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \ +CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \ -DG_LOG_DOMAIN=\"Openbox\" -LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) +LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS) LDFLAGS += -export-dynamic target = openbox3
M
m4/openbox.m4
→
m4/openbox.m4
@@ -38,8 +38,6 @@ AC_MSG_RESULT([$MSG])
test "$DEBUG" = "yes" && \ AC_DEFINE([DEBUG], [1], [Creating a debug build]) - - AM_CONDITIONAL(CVS, test "$CVS" = "yes") ])@@ -82,7 +80,7 @@ [ --enable-nls Enable NLS translations default=yes],
[NLS=$enableval], [NLS="yes"]) if test "$NLS" = yes; then - CPPFLAGS="$CPPFLAGS -DENABLE_NLS" + DEFS="$DEFS -DENABLE_NLS" fi ])
M
m4/x11.m4
→
m4/x11.m4
@@ -4,12 +4,16 @@ # Check for the presence of the X Window System headers and libraries.
# Sets the CPPFLAGS and LIBS variables as appropriate. AC_DEFUN([X11_DEVEL], [ - AC_PATH_X AC_PATH_XTRA test "$no_x" = "yes" && \ AC_MSG_ERROR([The X Window System could not be found.]) + + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" + X_LIBS="$X_LIBS -lX11" LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" # Check for required functions in -lX11@@ -18,6 +22,11 @@ [X11], [XOpenDisplay],
, AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]) ) + + # Restore the old values. Use X_CFLAGS and X_PRE_LIBS X_LIBS X_EXTRA_LIBS in + # the Makefiles + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS ])@@ -160,7 +169,7 @@ ])
]) ) -# Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's + # Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefiles LIBS=$OLDLIBS CPPFLAGS=$OLDCPPFLAGS@@ -178,6 +187,13 @@ AC_DEFUN([X11_EXT_XKB],
[ AC_REQUIRE([X11_DEVEL]) + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" + AC_CHECK_LIB([X11], [XkbBell], AC_MSG_CHECKING([for X11/XKBlib.h]) AC_TRY_LINK(@@ -201,6 +217,10 @@ AC_MSG_RESULT([no])
XKB="no" ]) ) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + AC_MSG_CHECKING([for the Xkb extension]) if test "$XKB" = "yes"; then AC_MSG_RESULT([yes])@@ -218,6 +238,13 @@ AC_DEFUN([X11_EXT_SHAPE],
[ AC_REQUIRE([X11_DEVEL]) + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" + AC_CHECK_LIB([Xext], [XShapeCombineShape], AC_MSG_CHECKING([for X11/extensions/shape.h]) AC_TRY_LINK(@@ -240,7 +267,11 @@ AC_MSG_RESULT([no])
SHAPE="no" ]) ) - AC_MSG_CHECKING([for the Shape extension]) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + + AC_MSG_CHECKING([for the Shape extension]) if test "$SHAPE" = "yes"; then AC_MSG_RESULT([yes]) else@@ -258,6 +289,13 @@ AC_DEFUN([X11_EXT_XINERAMA],
[ AC_REQUIRE([X11_DEVEL]) + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXext" + AC_CHECK_LIB([Xinerama], [XineramaQueryExtension], [ AC_MSG_CHECKING([for X11/extensions/Xinerama.h])@@ -273,13 +311,18 @@ [
AC_MSG_RESULT([yes]) XINERAMA="yes" AC_DEFINE([XINERAMA], [1], [Enable support of the Xinerama extension]) - LIBS="$LIBS -lXinerama" + XINERAMA_LIBS="-lXext -lXinerama" + AC_SUBST(XINERAMA_LIBS) ], [ AC_MSG_RESULT([no]) XINERAMA="no" ]) ]) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + AC_MSG_CHECKING([for the Xinerama extension]) if test "$XINERAMA" = "yes"; then AC_MSG_RESULT([yes])