foo-cvs

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6836

Modified Files:
	Makefile.am configure.ac 
Log Message:
added scm subdirs

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.ac	6 Aug 2004 05:59:27 -0000	1.8
--- configure.ac	7 Aug 2004 22:54:04 -0000	1.9
***************
*** 27,33 ****
  _AM_DEPENDENCIES([OBJC])
  
- # Check whether we are doing a native build
- AM_CONDITIONAL(NATIVE_BUILD, test "${cross_compiling}" = "no")
- 
  # Check for ObjC-runtime
  OD_OBJC_RUNTIME
--- 27,30 ----
***************
*** 49,53 ****
  AC_TYPE_SIGNAL
  AC_FUNC_STAT
! AC_CHECK_FUNCS([gettimeofday getcwd memset mkdir pow rint rmdir sqrt strdup sigaction])
  
  # check for foundation library to use
--- 46,50 ----
  AC_TYPE_SIGNAL
  AC_FUNC_STAT
! AC_CHECK_FUNCS([gettimeofday getcwd memset mkdir pow rint rmdir sqrt strdup sigaction getenv setenv unsetenv])
  
  # check for foundation library to use
***************
*** 127,131 ****
  
  if test "${have_elk}" = no; then
!     AC_CHECK_HEADERS([elk/scheme.h], [have_elk=yes], [have_elk=no])
  
    if test "${have_elk}" = yes; then
--- 124,128 ----
  
  if test "${have_elk}" = no; then
!   AC_CHECK_HEADERS([elk/scheme.h], [have_elk=yes], [have_elk=no])
  
    if test "${have_elk}" = yes; then
***************
*** 149,188 ****
  fi
  
! # get elk's/fooelk's libdir
! AC_MSG_CHECKING([for ${ELK_LIBRARY} installation dirs])
! AC_TRY_RUN([
! #include <stdio.h>
! #include <${ELK_LIBRARY}/scheme.h>
  
! extern char *Lib_Dir;
! extern char *Scm_Dir;
  
! int
! main (int argc,
!       char **argv)
! {
!   FILE *file;
  
!   Elk_Init(argc, argv, 0, 0);
  
!   if (Lib_Dir == NULL || Scm_Dir == NULL)
!     {
!       exit(1);
!     }
  
!   if (! (file = fopen("conftest.data", "w")))
!     {
!       exit(1);
!     }
  
!   fputs(Lib_Dir, file);
!   fputs("\n", file);
!   fputs(Scm_Dir, file);
!   fputs("\n", file);
!   fclose(file);
  
!   exit(0);
! }
! ],
      [AC_MSG_RESULT([done])
  
--- 146,191 ----
  fi
  
! # integrate with elk/fooelk or standalone?
! AC_ARG_ENABLE(elk-integration,
!     AC_HELP_STRING([--disable-elk-integration], [do not install elkfoo extension files into elk's extension directory]),
!     enable_elk_integration=no, enable_elk_integration=yes)
  
! if test ${enable_elk_integration} = "yes"; then
!   # get elk's/fooelk's libdir
!   AC_MSG_CHECKING([for ${ELK_LIBRARY} installation dirs])
!   AC_TRY_RUN([
!   #include <stdio.h>
!   #include <${ELK_LIBRARY}/scheme.h>
  
!   extern char *Lib_Dir;
!   extern char *Scm_Dir;
  
!   int
!   main (int argc,
! 	char **argv)
!   {
!     FILE *file;
  
!     Elk_Init(argc, argv, 0, 0);
  
!     if (Lib_Dir == NULL || Scm_Dir == NULL)
!       {
!         exit(1);
!       }
  
!     if (! (file = fopen("conftest.data", "w")))
!       {
!         exit(1);
!       }
  
!     fputs(Lib_Dir, file);
!     fputs("\n", file);
!     fputs(Scm_Dir, file);
!     fputs("\n", file);
!     fclose(file);
! 
!     exit(0);
!   }
!   ],
      [AC_MSG_RESULT([done])
  
***************
*** 202,207 ****
      AC_MSG_NOTICE([using elk libdir ${ELK_LIB_DIR}])
      AC_MSG_NOTICE([using elk scmdir ${ELK_SCM_DIR}])],
! [AC_MSG_RESULT([failed])
      AC_MSG_ERROR([couldn't determine ${ELK_LIBRARY} installation dirs])])
  
  # check for libfoo
--- 205,218 ----
      AC_MSG_NOTICE([using elk libdir ${ELK_LIB_DIR}])
      AC_MSG_NOTICE([using elk scmdir ${ELK_SCM_DIR}])],
!   [AC_MSG_RESULT([failed])
      AC_MSG_ERROR([couldn't determine ${ELK_LIBRARY} installation dirs])])
+ else
+   # defaults
+   ELK_LIB_DIR="\$(libdir)/${PACKAGE}"
+   ELK_SCM_DIR="\$(datadir)/${PACKAGE}"
+   ELK_INC_DIR="\$(includedir)/${PACKAGE}"
+   # substitute correct libpath in toplevel.scm.in
+   ELKFOO_LIB_DIR=${ELK_LIB_DIR}
+ fi
  
  # check for libfoo
***************
*** 210,214 ****
  # CHECK DEFFERED
  if test -z "${RECURSIVE_BUILD}"; then
!    AC_MSG_WARN([ommitting check for libfoo])
     ELKFOO_EXT_LIBS="${ELKFOO_EXT_LIBS} -lfoo"
  
--- 221,225 ----
  # CHECK DEFFERED
  if test -z "${RECURSIVE_BUILD}"; then
!    AC_MSG_WARN([FIXME: omitting check for libfoo])
     ELKFOO_EXT_LIBS="${ELKFOO_EXT_LIBS} -lfoo"
  
***************
*** 259,262 ****
--- 270,274 ----
  AC_SUBST(ELK_LIB_DIR)
  AC_SUBST(ELK_SCM_DIR)
+ AC_SUBST(ELKFOO_LIB_DIR)
  
  # output files
***************
*** 267,270 ****
--- 279,293 ----
    include/Makefile
    src/Makefile
+   scm/Makefile
+   scm/kernel/Makefile
+   scm/control/Makefile
+   scm/control/abstraction/Makefile
+   scm/control/envelope/Makefile
+   scm/control/interface-lib/Makefile
+   scm/control/node/Makefile
+   scm/control/processes/Makefile
+   scm/tools/Makefile
+   scm/tools/mixsnd/Makefile
+   scm/tools/util/Makefile
   ])
  
***************
*** 275,278 ****
--- 298,302 ----
  elkfoo version: ${VERSION}
  elk library used: ${ELK_LIBRARY}
+ integrate with elk: ${enable_elk_integration}
  objective-c runtime: ${OBJC_RUNTIME}
  foundation framework: ${use_foundation}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	4 Aug 2004 07:13:08 -0000	1.1
--- Makefile.am	7 Aug 2004 22:54:04 -0000	1.2
***************
*** 6,10 ****
  NULL = 
  
! SUBDIRS = include src # scm
  DIST_SUBDIRS = $(SUBDIRS) autotools m4
  
--- 6,10 ----
  NULL = 
  
! SUBDIRS = include src scm
  DIST_SUBDIRS = $(SUBDIRS) autotools m4