Fix build-system: install data files (keys, apps, menu ...)

* Correctly build data files when operate outside of the $(srcdir)
* Actually install data files
* Use pkg-config to detect X11, works better on MacOSX. We used pkg-config
  already anyway, double checking for X11 does not yield better results.
* Replace EXEEXT in some files while before installing them

1 files changed, 15 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index 33217ad..d6d5612 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,14 +194,24 @@ dnl Check for networking libraries
 AC_CHECK_LIB([nsl], [t_open], [LIBS="-lnsl $LIBS"])
 AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"])
 
-dnl Check for X headers and libraries
-AC_PATH_X
-AC_PATH_XTRA
-AS_IF([test x$no_x = "xyes"], [
+#dnl Check for X headers and libraries
+#AC_PATH_X
+#AC_PATH_XTRA
+#AS_IF([test x$no_x = "xyes"], [
+#       AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.])
+#])
+
+dnl Check for X11
+PKG_CHECK_MODULES([X11], [ x11 ],
+        [AC_DEFINE([HAVE_X11], [1], [Define if x11 is available]) have_x11=yes],
+        [have_x11=no])
+AM_CONDITIONAL([X11], [test "$have_x11" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]))
+AS_IF([test x$have_x11 = "xno"], [
         AC_MSG_ERROR([Fluxbox requires the X Window System libraries and headers.])
 ])
 
-LIBS="$X_LIBS $LIBS"
+CXXFLAGS="$X11_CFLAGS $CXXFLAGS"
+LIBS="$X11_LIBS $LIBS"
 
 dnl Check for xpg4
 AC_CHECK_LIB([xpg4], [setlocale], [LIBS="-lxpg4 $LIBS"])
@@ -371,12 +381,6 @@ AS_IF([test "x$enable_imlib2" != "xno"], [
 ])
 AM_CONDITIONAL([IMLIB2], [test "$have_imlib2" = "yes"])
 
-dnl Check for X11
-PKG_CHECK_MODULES([X11], [ x11 ],
-        [AC_DEFINE([HAVE_X11], [1], [Define if x11 is available]) have_x11=yes],
-        [have_x11=no])
-AM_CONDITIONAL([X11], [test "$have_x11" = "yes"], AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]))
-
 dnl Check for X fonts
 have_xft=no
 AC_ARG_ENABLE([xft], AS_HELP_STRING([--disable-xft], [disable xft support]))