Merge lp:~ken-vandine/overlay-scrollbar/xsession into lp:overlay-scrollbar

[Ken VanDine]

Install an xsession script to enable the scrollbars globally

[Andrea Cimitan (cimi)]

looks good to me, well done ken!

review: Approve

[lp:~ken-vandine/overlay-scrollbar/xsession]

217. By Andrea Cimitan on 2011-04-21

merged branch xsession and prepare to 0.1.9

=== modified file 'Makefile.am'
--- Makefile.am	2011-03-02 16:15:54 +0000
+++ Makefile.am	2011-04-21 14:36:09 +0000
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	misc \
+	data \
 	build \
 	pkgconfig \
 	os \
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-20 18:52:11 +0000
+++ configure.ac	2011-04-21 14:36:09 +0000
@@ -22,6 +22,7 @@
 OS_LT_AGE=0
 OS_LT_VERSION="$OS_LT_CURRENT:$OS_LT_REV:$OS_LT_AGE"
 OS_LT_LDFLAGS="-version-info $OS_LT_VERSION"
+AC_SUBST(OS_LT_CURRENT)
 AC_SUBST(PGM_LT_VERSION)
 AC_SUBST(PGM_LT_LDFLAGS)
 
@@ -137,6 +138,7 @@
 AC_CONFIG_FILES([
   Makefile
   misc/Makefile
+  data/Makefile
   build/Makefile
   pkgconfig/Makefile
   pkgconfig/overlay-scrollbar.pc
 
=== added directory 'data'
=== added file 'data/81overlay-scrollbar.in'
--- data/81overlay-scrollbar.in	1970-01-01 00:00:00 +0000
+++ data/81overlay-scrollbar.in	2011-04-21 14:36:09 +0000
@@ -0,0 +1,4 @@
+if [ -f @libdir@/liboverlay-scrollbar-@OS_MAJORMINOR@.so.@OS_LT_CURRENT@ ]
+then
+	export LIBOVERLAY_SCROLLBAR=1
+fi
 
=== added file 'data/Makefile.am'
--- data/Makefile.am	1970-01-01 00:00:00 +0000
+++ data/Makefile.am	2011-04-21 14:36:09 +0000
@@ -0,0 +1,10 @@
+EXTRA_DIST = 81overlay-scrollbar.in
+
+CLEANFILES = 81overlay-scrollbar
+
+81overlay-scrollbar: 81overlay-scrollbar.in
+	sed -e "s|\@libdir\@|$(libdir)|" -e "s|\@OS_MAJORMINOR\@|@OS_MAJORMINOR@|" -e "s|\@OS_LT_CURRENT\@|$(OS_LT_CURRENT)|" $< > $@
+
+xsessiondir = $(sysconfdir)/X11/Xsession.d
+
+nodist_xsession_DATA = 81overlay-scrollbar