foo-cvs

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

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

Modified Files:
	configure.ac 
Log Message:
detect elk installation dirs, added header install dir detection

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.ac	5 Aug 2004 08:56:12 -0000	1.2
--- configure.ac	5 Aug 2004 19:00:04 -0000	1.3
***************
*** 149,153 ****
  
  # get elk's/fooelk's libdir
! AC_MSG_CHECKING([for elk installation dirs])
  AC_TRY_RUN([
  #include <stdio.h>
--- 149,153 ----
  
  # get elk's/fooelk's libdir
! AC_MSG_CHECKING([for ${ELK_LIBRARY} installation dirs])
  AC_TRY_RUN([
  #include <stdio.h>
***************
*** 184,194 ****
  }
  ],
! [AC_MSG_RESULT([done])
!  ELK_LIB_DIR=`head -n1 conftest.data`
!  ELK_SCM_DIR=`tail -n1 conftest.data`
!  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
--- 184,206 ----
  }
  ],
!     [AC_MSG_RESULT([done])
! 
!     ELK_LIB_DIR=`head -n1 conftest.data`
!     ELK_SCM_DIR=`tail -n1 conftest.data`
!     # quick'n'dirty'n'hacky: guess elk include dir
!     ELK_INC_DIR=`echo ${ELK_LIB_DIR} | sed -e 's/\/lib\//\/include\//g'`
!     # verify that
!     AC_CHECK_FILE([${ELK_INC_DIR}/scheme.h],
! 		[guessed_elk_incdir_hit=yes],
! 		[guessed_elk_incdir_hit=no])
!     if test ${guessed_elk_incdir_hit} = no; then
!        AC_MSG_WARN([couldn't determine ${ELK_LIBRARY} include dir])
!        ELK_INC_DIR=${includedir}/${PACKAGE}
!     fi
!     AC_MSG_NOTICE([using elk incdir ${ELK_INC_DIR}])
!     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
***************
*** 239,242 ****
--- 251,256 ----
  AC_SUBST(FOO_GNUSTEP_OBJCFLAGS)
  AC_SUBST(FOO_GNUSTEP_LDFLAGS)
+ AC_SUBST(ELK_LIBRARY)
+ AC_SUBST(ELK_INC_DIR)
  AC_SUBST(ELK_LIB_DIR)
  AC_SUBST(ELK_SCM_DIR)