Make *.scm file installation directory configurable

mwitmer · Feb 3, 2014 · 66713a7 · 66713a7
1 parent 79b4ac8
commit 66713a7
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 2 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -322,6 +322,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+guilesitedir = @guilesitedir@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@

diff --git a/configure b/configure
@@ -586,6 +586,7 @@ PACKAGE_URL=''
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+guilesitedir
 GUILE_SITE
 GUILE_TOOLS
 GUILE_CONFIG
@@ -663,6 +664,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
+with_guile_site_dir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1287,6 +1289,12 @@ Optional Features:
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-guile-site-dir   use the specified installation path for Guile
+                          modules
+
 Some influential environment variables:
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
@@ -2802,6 +2810,21 @@ $as_echo "$ac_guile_module_required" >&6; }
               as_fn_error $? "required guile module not found: (xcb xml xproto)" "$LINENO" 5
           fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if (xcb xml struct) is available" >&5
+$as_echo_n "checking if (xcb xml struct) is available... " >&6; }
+
+  $GUILE -c "(use-modules (xcb xml struct)) (exit ((lambda () 0)))" > /dev/null 2>&1
+  ac_guile_module_required=$?
+
+	  if test "$ac_guile_module_required" = "0" ; then ac_guile_module_required=yes ; else ac_guile_module_required=no ; fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_guile_module_required" >&5
+$as_echo "$ac_guile_module_required" >&6; }
+
+
+          if test "$ac_guile_module_required" = "no" ; then
+              as_fn_error $? "required guile module not found: (xcb xml struct)" "$LINENO" 5
+          fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if (xcb xml ext randr) is available" >&5
 $as_echo_n "checking if (xcb xml ext randr) is available... " >&6; }
 
@@ -2833,6 +2856,20 @@ $as_echo "$ac_guile_module_required" >&6; }
           fi
 
 
+
+# Check whether --with-guile-site-dir was given.
+if test "${with_guile_site_dir+set}" = set; then :
+  withval=$with_guile_site_dir; guilesitedir="$withval"
+else
+  guilesitedir="$GUILE_SITE"
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $guilesitedir" >&5
+$as_echo "$guilesitedir" >&6; }
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

diff --git a/configure.ac b/configure.ac
@@ -18,7 +18,19 @@ GUILE_PROGS
 
 GUILE_MODULE_REQUIRED([xcb xml])
 GUILE_MODULE_REQUIRED([xcb xml xproto])
+GUILE_MODULE_REQUIRED([xcb xml struct])
 GUILE_MODULE_REQUIRED([xcb xml ext randr])
 GUILE_MODULE_REQUIRED([xcb event-loop])
 
+AC_ARG_WITH([guile-site-dir],
+        [AS_HELP_STRING([--with-guile-site-dir],
+            [use the specified installation path for Guile modules]
+        )],
+        [guilesitedir="$withval"],
+        [guilesitedir="$GUILE_SITE"]
+)
+
+AC_SUBST([guilesitedir])
+AC_MSG_RESULT($guilesitedir)
+
 AC_OUTPUT
diff --git a/module/Makefile.am b/module/Makefile.am
@@ -19,7 +19,7 @@
 ##   not, write to the Free Software Foundation, Inc., 51 Franklin
 ##   Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-wmdir = $(GUILE_SITE)
+wmdir = $(guilesitedir)
 nobase_dist_wm_DATA =                     \
 guile-wm/color.scm                        \
 guile-wm/focus.scm                        \
@@ -37,9 +37,11 @@ guile-wm/keymap.scm                       \
 guile-wm/log.scm                          \
 guile-wm/redirect.scm                     \
 guile-wm/module/cursor.scm                \
+guile-wm/module/magnetic.scm              \
 guile-wm/module/message.scm               \
 guile-wm/module/repl.scm                  \
 guile-wm/module/simple-reparent.scm       \
+guile-wm/module/tiling.scm                \
 guile-wm/module/window-cycle.scm          \
 guile-wm/module/fullscreen.scm            \
 guile-wm/module/minibuffer.scm            \

diff --git a/module/Makefile.in b/module/Makefile.in
@@ -193,6 +193,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+guilesitedir = @guilesitedir@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@
@@ -217,7 +218,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-wmdir = $(GUILE_SITE)
+wmdir = $(guilesitedir)
 nobase_dist_wm_DATA = \
 guile-wm/color.scm                        \
 guile-wm/focus.scm                        \
@@ -235,9 +236,11 @@ guile-wm/keymap.scm                       \
 guile-wm/log.scm                          \
 guile-wm/redirect.scm                     \
 guile-wm/module/cursor.scm                \
+guile-wm/module/magnetic.scm              \
 guile-wm/module/message.scm               \
 guile-wm/module/repl.scm                  \
 guile-wm/module/simple-reparent.scm       \
+guile-wm/module/tiling.scm                \
 guile-wm/module/window-cycle.scm          \
 guile-wm/module/fullscreen.scm            \
 guile-wm/module/minibuffer.scm            \