+ Some patches from Daniel Kobras, mainly to reenable load-scx.scm from the source directory
+ Bump the version number to 0.2
This commit is contained in:
		
							parent
							
								
									b8ddec939b
								
							
						
					
					
						commit
						abdae75b90
					
				| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,8 +1,6 @@
 | 
			
		|||
  #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
 | 
			
		||||
          
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +16,7 @@
 | 
			
		|||
 | 
			
		||||
  AC_ARG_WITH(scsh-includes, 
 | 
			
		||||
                    AC_HELP_STRING([--with-scsh-includes=DIR],  
 | 
			
		||||
                                    [scsh include files are in DIR [/usr/local/include]]),
 | 
			
		||||
                                    [scsh include files are in DIR @<:@/usr/local/include@:>@]),
 | 
			
		||||
                     scsh_includes=$withval, 
 | 
			
		||||
                     scsh_includes=/usr/local/include)
 | 
			
		||||
          AC_SUBST(scsh_includes)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue