[syslog-ng] Switching libol away from scsh

[Tommi Virtanen]

--AhhlLboLdkugWU4S
Content-Type: text/plain; charset=us-ascii

        Hi. Currently, scsh's license is non-free. The
        author has promised to fix this, but seems to
        be incredibly busy with other issues, or just
        disinterested.

        Meanwhile, I'd like syslog-ng to be as free as
        possible; that includes not needing scsh to work.

        I recently made minor modifications to lsh to
        make it work without scsh (Ray Dassen will be
        integrating my changes in the lsh distribution
        shortly; I will provide the patch by email if
        requested), and as syslog-ng and libol share the
        same backend, those modifications were quite easy
        to port to libol.

        What follows is a diff file that modifies libol
        to use Guile instead of scsh. Hopefully you will
        integrate this into your distribution. Thank You.

-- 
Havoc Consulting | unix, linux, perl, mail, www, internet, security consulting
+358 50 5486010  | software development, unix administration, training

--AhhlLboLdkugWU4S
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libol-guilify.patch"

# This is a patch for libol to update it to libol-guilify.
# It was generated by makepatch 1.93 (2.0BETA) on Thu Jun  3 03:37:47 1999.
#
# To apply this patch, chdir to source directory libol and enter
#
#     patch -p1 -N < <this-file>

exit
# End of preamble.

# Patch input follows.
__DATA__
Index: configure.in
####### libol-guilify/ => libol-guilify
*** libol-guilify/configure.in	Sat May  8 23:04:58 1999
--- libol-guilify/configure.in	Thu Jun  3 02:06:50 1999
***************
*** 35,41 ****
  AC_PROG_RANLIB
  AC_PROG_CC
  AC_PROG_MAKE_SET
! AC_PATH_PROG(SCSH, scsh,, $PATH)
  AM_PROG_LIBTOOL
  
  dnl Checks for libraries.
--- 35,41 ----
  AC_PROG_RANLIB
  AC_PROG_CC
  AC_PROG_MAKE_SET
! AC_PATH_PROG(SCHEME, guile,, $PATH)
  AM_PROG_LIBTOOL
  
  dnl Checks for libraries.
***************
*** 91,97 ****
  
  MAKE_CLASS="$srcdir/utils/make_class"
  AC_SUBST(MAKE_CLASS)
! AC_SUBST(SCSH)
  
  AC_OUTPUT(Makefile src/Makefile utils/Makefile libol-config,chmod +x libol-config)
  
--- 91,97 ----
  
  MAKE_CLASS="$srcdir/utils/make_class"
  AC_SUBST(MAKE_CLASS)
! AC_SUBST(SCHEME)
  
  AC_OUTPUT(Makefile src/Makefile utils/Makefile libol-config,chmod +x libol-config)
  
Index: utils/Makefile.am
####### libol-guilify/ => libol-guilify
*** libol-guilify/utils/Makefile.am	Sat May  8 22:55:02 1999
--- libol-guilify/utils/Makefile.am	Thu Jun  3 02:07:14 1999
***************
*** 1,4 ****
! SCSH = @SCSH@
  
  EXTRA_DIST=make_class.in
  
--- 1,4 ----
! SCHEME = @SCHEME@
  
  EXTRA_DIST=make_class.in
  
***************
*** 7,11 ****
  all: make_class
  
  make_class: make_class.in Makefile
! 	sed -e "s,_SCSH_,$(SCSH)," make_class.in >make_class
  	chmod +x make_class
--- 7,11 ----
  all: make_class
  
  make_class: make_class.in Makefile
! 	sed -e "s,_SCHEME_,$(SCHEME)," make_class.in >make_class
  	chmod +x make_class
Index: utils/make_class.in
####### libol-guilify/ => libol-guilify
*** libol-guilify/utils/make_class.in	Sat May  8 22:55:02 1999
--- libol-guilify/utils/make_class.in	Thu Jun  3 03:13:41 1999
***************
*** 1,4 ****
! #! _SCSH_ \
  -e main -s
  !#
  
--- 1,4 ----
! #! _SCHEME_ \
  -e main -s
  !#
  
***************
*** 16,23 ****
  ;; FIXME: Perhaps the files should somehow be fed through the
  ;; preprocessor first?
  
  (define (werror f . args)
!   (display (apply format #f f args) 2))
  
  (define (string-prefix? prefix s)
    (let ((l (string-length prefix)))
--- 16,25 ----
  ;; FIXME: Perhaps the files should somehow be fed through the
  ;; preprocessor first?
  
+ (load-from-path "scsh/init") ; scsh compability
+ 
  (define (werror f . args)
!   (display (apply format #f f args) (current-error-port)))
  
  (define (string-prefix? prefix s)
    (let ((l (string-length prefix)))


End of Patch.

--AhhlLboLdkugWU4S--