various changes to make scsh-ldap build with separatly distributed

ffi-tools

c/Makefile.am

@@ -1,19 +1,9 @@
-INCLUDES = -I@top_srcdir@/c -I@top_srcdir@/ffi-tools -I@scsh_includes@
+INCLUDES = -I@top_srcdir@/c -I@scsh_includes@
-SCSH= @SCSH@
+FFI_TOOLS_PREFIX=@ffi_tools_prefix@
-
+CLEANFILES= ldap-consts.c ffi-tools.*
-GENERATED_CODE= ldap-consts.c
-SCHEME_DIR= ../scheme
-FFITOOLS_DIR= ../ffi-tools
-CLEANFILES= $(GENERATED_CODE)
 
 libsys_LTLIBRARIES= libscshldap.la
 
-libscshldap_la_SOURCES= ldap.c $(FFITOOLS_DIR)/ffi-tools.c $(GENERATED_CODE)
+libscshldap_la_SOURCES=ldap.c $(FFI_TOOLS_PREFIX)/ffi-tools.c ldap-consts.c
 libscshldap_la_LDFLAGS= -avoid-version -module
-libscshldap_la_DEPENDENCIES= $(GENERATED_CODE)
+libscshldap_la_DEPENDENCIES=
-
-$(GENERATED_CODE):
-	$(SCSH) -lm $(FFITOOLS_DIR)/ffi-tools-package.scm \
-	     -lm $(SCHEME_DIR)/ldap-constants.scm \
-	     -o ldap-constants -c '(make-c-files command-line-arguments)' \
-	     `pwd`

configure.in

@@ -1,14 +1,12 @@
-AC_INIT(scsh-ldap, 0.1)
+AC_INIT(c/ldap.c)
-AC_CONFIG_SRCDIR(configure.in)
+AM_INIT_AUTOMAKE(scsh-ldap, 0.1)
-AM_INIT_AUTOMAKE
-
-dnl AM_MAINTAINER_MODE
-
 AM_CONFIG_HEADER(c/config.h)
-AC_PROG_LIBTOOL
-AC_PROG_CC
 
-AC_HEADER_STDC
+AC_ENABLE_SHARED
+AM_PROG_LIBTOOL
+
+AC_PROG_CC
+AC_STDC_HEADERS
 AC_CHECK_HEADERS([sys/time.h errno.h])
 
 dnl scsh includes (scheme48.h)

pkg-def.scm

@@ -69,6 +69,8 @@
     (write-to-load-script
      `((user)
        (load-package 'dynamic-externals)
+       (load-package 'ffi-tools-rts)
+       (load-package 'exceptions)
        (open 'dynamic-externals)
        (open 'external-calls)
        (open 'configure)