From abdae75b905415a8b4a57b25876fc0e73d9ddcf1 Mon Sep 17 00:00:00 2001
From: mainzelm <mainzelm>
Date: Mon, 1 Dec 2003 16:09:09 +0000
Subject: [PATCH] + Some patches from Daniel Kobras, mainly to reenable
 load-scx.scm from the source directory + Bump the version number to 0.2

---
 c/Makefile.am          |  8 ++++++++
 configure.in           | 16 +++++++---------
 scheme/Makefile.am     |  4 +++-
 scheme/load-scx.scm.in |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/c/Makefile.am b/c/Makefile.am
index 3804250..3f77957 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -1,2 +1,10 @@
 SUBDIRS = xlib
 
+EXTRA_DIST= \
+	xt/resource.c \
+	xt/widget.c \
+	libs/xrender.c \
+	libs/xft.c \
+	libs/xft.h \
+	libs/xpm.c \
+	libs/xrender.h
diff --git a/configure.in b/configure.in
index dab1bfb..d0bd923 100644
--- a/configure.in
+++ b/configure.in
@@ -1,24 +1,22 @@
-  #AC_DEFUN(
- 
   define([SCX_PREPEND], [[$2]="$[$2] [$1]"])
  
-  AC_INIT(scx, 0.1)
+  AC_INIT(scx, 0.2)
   AC_CONFIG_SRCDIR(configure.in)
   AM_INIT_AUTOMAKE
           
   AC_CONFIG_HEADERS(c/config.h)
 
-          AC_PROG_LIBTOOL
+  AC_PROG_LIBTOOL
 
 
 
-          AC_PROG_CC
+  AC_PROG_CC
  
-          AC_PATH_XTRA
+  AC_PATH_XTRA
 
-          AC_ARG_WITH(scsh-includes, 
-                     AC_HELP_STRING([--with-scsh-includes=DIR],  
-                                    [scsh include files are in DIR [/usr/local/include]]),
+  AC_ARG_WITH(scsh-includes, 
+                    AC_HELP_STRING([--with-scsh-includes=DIR],  
+                                    [scsh include files are in DIR @<:@/usr/local/include@:>@]),
                      scsh_includes=$withval, 
                      scsh_includes=/usr/local/include)
           AC_SUBST(scsh_includes)
diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index e15a7d6..5c07e08 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -45,10 +45,12 @@ CLEANFILES= load-scx.scm
 
 load-scx.scm: $(srcdir)/load-scx.scm.in
 	sed -e "s|@scxschemedir@|`pwd`/$(srcdir)|g" \
-	    -e "s|@scxlibdir@|`pwd`/../c/xlib/.libs|g" $< > $@ #won't work
+	    -e "s|@scxhost@||g" \
+	    -e "s|@scxlibdir@|`pwd`/../c/xlib/.libs|g" $< > $@
 
 install-data-hook:
 	sed -e "s|@scxschemedir@|$(schemedir)|g" \
+	    -e "s|@scxhost@|(host)|g" \
 	    -e "s|@scxlibdir@|$(libdir)|g" \
 		$(srcdir)/load-scx.scm.in \
 		> $(DESTDIR)/$(schemedir)/load-scx.scm
diff --git a/scheme/load-scx.scm.in b/scheme/load-scx.scm.in
index ce45136..8f38a4c 100644
--- a/scheme/load-scx.scm.in
+++ b/scheme/load-scx.scm.in
@@ -7,7 +7,7 @@
 (load-package 'configure)
 (open 'configure)
 (run '(let ((initializer-name "scx_init_xlib")
-            (module-file (string-append "@scxlibdir@/" (host) "/libscx.so")))
+            (module-file (string-append "@scxlibdir@/" @scxhost@ "/libscx.so")))
         (dynamic-load module-file)
         (call-external (get-external initializer-name))))
 (config)