[foo-cvs] foo/libfoo bootstrap,1.1.1.1,1.2 configure.ac,1.1.1.1,1.2

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

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

Modified Files:
	bootstrap configure.ac 
Log Message:
adopting build system to mac os x

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure.ac	30 Jul 2004 20:10:23 -0000	1.1.1.1
--- configure.ac	31 Jul 2004 02:16:30 -0000	1.2
***************
*** 24,28 ****
  AC_PROG_LIBTOOL
  
! # set dependencies for objc
  _AM_DEPENDENCIES([OBJC])
  
--- 24,28 ----
  AC_PROG_LIBTOOL
  
! # set objc stuff
  _AM_DEPENDENCIES([OBJC])
  
***************
*** 98,102 ****
  
  # check for libsndfile
! PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.10)
  
  FOO_CFLAGS="${FOO_CFLAGS} ${SNDFILE_CFLAGS}"
--- 98,110 ----
  
  # check for libsndfile
! 
! # pkgconfig does not work on that great OS called OS X
! # PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.10)
! 
! # do it "haendisch"
! AC_CHECK_HEADERS(sndfile.h)
! AC_CHECK_LIB(sndfile, sf_open,
!              [SNDFILE_LIBS="-lsndfile"],
!              [AC_MSG_ERROR([cannot find libsndfile])])
  
  FOO_CFLAGS="${FOO_CFLAGS} ${SNDFILE_CFLAGS}"
***************
*** 104,138 ****
  FOO_LIBS="${FOO_LIBS} ${SNDFILE_LIBS}"
  
- dnl # set foo version
- dnl AC_MSG_CHECKING(for the version of foo we are compiling)
- dnl if test -f "Version"; then
- dnl   . ./Version
- dnl fi
- dnl AC_MSG_RESULT($FOO_VERSION)
- dnl AC_SUBST(FOO_VERSION)
- dnl AC_SUBST(FOO_MAJOR_VERSION)
- dnl AC_SUBST(FOO_MINOR_VERSION)
- dnl AC_SUBST(FOO_SUBMINOR_VERSION)
- 
- dnl # export paths
- dnl AC_SUBST(FOO_INSTALL_ROOT)
- dnl AC_SUBST(FOO_BIN_INSTALL_DIR)
- dnl AC_SUBST(FOO_LIB_INSTALL_DIR)
- dnl AC_SUBST(FOO_HEADER_INSTALL_DIR)
- dnl AC_SUBST(FOO_SCM_INSTALL_DIR)
- dnl AC_SUBST(FOO_DOC_INSTALL_DIR)
- 
- dnl # export includes, libs etc.
- dnl AC_SUBST(ADDITIONAL_INCLUDE_DIRS)
- dnl AC_SUBST(ADDITIONAL_LIB_DIRS)
- dnl AC_SUBST(ADDITIONAL_LIBS)
- 
- dnl # configure
- dnl AC_CONFIG_FILES([foo.make])
- 
  INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
  AC_SUBST(INCLUDES)
  
! dnl  Export variables
  AC_SUBST(FOO_CFLAGS)
  AC_SUBST(FOO_OBJCFLAGS)
--- 112,122 ----
  FOO_LIBS="${FOO_LIBS} ${SNDFILE_LIBS}"
  
  INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
  AC_SUBST(INCLUDES)
  
! # workaround for automake <= 1.6
! AC_SUBST(OBJC)
! 
! # Export variables
  AC_SUBST(FOO_CFLAGS)
  AC_SUBST(FOO_OBJCFLAGS)

Index: bootstrap
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/bootstrap,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bootstrap	30 Jul 2004 20:10:23 -0000	1.1.1.1
--- bootstrap	31 Jul 2004 02:16:30 -0000	1.2
***************
*** 6,12 ****
  ##  $Id$
  
- # set -x
- # set -e
- 
  # Get a sane environment, just in case
  LANG=C
--- 6,9 ----
***************
*** 14,42 ****
  
  # Check for automake
! amvers="no"
! # if automake-1.8 --version >/dev/null 2>&1; then
! #   amvers="-1.8"
! # elif automake-1.7 --version >/dev/null 2>&1; then
! if automake-1.7 --version >/dev/null 2>&1; then
!   amvers="-1.7"
! elif automake-1.6 --version >/dev/null 2>&1; then
!   amvers="-1.6"
! elif automake-1.5 --version >/dev/null 2>&1; then
!   amvers="-1.5"
! elif automake --version > /dev/null 2>&1; then
!   amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
!   if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
!     amvers="no"
!   else
!     amvers=""
    fi
- fi
  
! if test "$amvers" = "no"; then
!   set +x
!   echo "$0: you need automake version 1.5 or later"
!   exit 1
  fi
  
  # Check for libtool
  libtoolize="no"
--- 11,45 ----
  
  # Check for automake
! if test -z $1; then
!   amvers="no"
!   if automake-1.8 --version >/dev/null 2>&1; then
!     amvers="-1.8"
!   elif automake-1.7 --version >/dev/null 2>&1; then
!     amvers="-1.7"
!   elif automake-1.6 --version >/dev/null 2>&1; then
!     amvers="-1.6"
!   elif automake-1.5 --version >/dev/null 2>&1; then
!     amvers="-1.5"
!   elif automake --version > /dev/null 2>&1; then
!     amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
!     if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
!       amvers="no"
!     else
!       amvers=""
!     fi
    fi
  
!   if test "$amvers" = "no"; then
!     set +x
!     echo "$0: you need automake version 1.5 or later"
!     exit 1
!   fi
! else
!   amvers=$1
  fi
  
+ set -x
+ set -e
+ 
  # Check for libtool
  libtoolize="no"