[foo-cvs] foo/elkfoo configure.ac,1.16,1.17

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

Update of /cvsroot/foo/foo/elkfoo
In directory sc8-pr-cvs17:/tmp/cvs-serv9533/elkfoo

Modified Files:
	configure.ac 
Log Message:
adopted build system for supporting gnustep-make >= 2.0.0

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure.ac	10 Apr 2007 14:05:41 -0000	1.16
--- configure.ac	14 Oct 2007 20:31:10 -0000	1.17
***************
*** 66,103 ****
  use_gnustep_base=no
  FOO_GNUSTEP_OBJCFLAGS=""
  FOO_GNUSTEP_LDFLAGS=""
  
  if test ${enable_gnustep} = yes; then
!    # check for gnustep
!    AC_MSG_CHECKING([for GNUstep installation])
  
!    # check for GNUSTEP_SYSTEM_ROOT
!    if test -z "$GNUSTEP_SYSTEM_ROOT"; then
!       AC_MSG_RESULT([no])
!       AC_MSG_ERROR([GNUSTEP_SYSTEM_ROOT not defined. Probably you forgot to run the GNUstep initialization script first.])
     else
!       AC_MSG_RESULT([yes])
!    fi
  
!    # check for base.make in order to obtain compile flags
!    AC_CHECK_FILE([${GNUSTEP_MAKEFILES}/Additional/base.make],
! 		 [use_gnustep_base=yes],
! 		 [AC_MSG_ERROR(gnustep-base package not found)])
  
!    # target specific stuff
!    case "$target_os" in
! 	freebsd* | openbsd* )   
  		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  		LDFLAGS="$LDFLAGS -L/usr/local/lib";;
! 	netbsd*)
  		CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
  		LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
!    esac
  
     use_foundation="GNUstep"
!    AC_DEFINE(FOO_GNUSTEP, 1, Define if we are using GNUstep)
!    FOO_GNUSTEP_OBJCFLAGS="\$(GNUSTEP_HEADERS_FLAGS) \$(AUXILIARY_OBJCFLAGS)"
!    FOO_GNUSTEP_INCLUDES="\$(GNUSTEP_HEADERS_FLAGS)"
!    FOO_GNUSTEP_LDFLAGS="\$(GNUSTEP_LIBRARIES_FLAGS)"
  
     # get rid of warnings regarding #import
--- 66,115 ----
  use_gnustep_base=no
  FOO_GNUSTEP_OBJCFLAGS=""
+ FOO_GNUSTEP_INCLUDES=""
  FOO_GNUSTEP_LDFLAGS=""
  
  if test ${enable_gnustep} = yes; then
!    AC_CHECK_PROG(use_gnustep_config, gnustep-config, yes, no)
  
!    if test ${use_gnustep_config} = "yes"; then
!       FOO_GNUSTEP_OBJCFLAGS=`gnustep-config --objc-flags`
!       FOO_GNUSTEP_LDFLAGS=`gnustep-config --base-libs`
!       # this feels rather hacky: is this valid for all gnustep installs?
!       # for src/main.c: #include <GSConfig.h>
!       FOO_GNUSTEP_INCLUDES="-I`gnustep-config --variable=GNUSTEP_SYSTEM_HEADERS`/GNUstepBase"
     else
!       # check for oldish gnustep installation with sourced variables
!       AC_MSG_CHECKING([for gnustep-make << 2.0.0 installation])
  
!       # check for GNUSTEP_SYSTEM_ROOT
!       if test -z "$GNUSTEP_SYSTEM_ROOT"; then
! 	 AC_MSG_RESULT([no])
! 	 AC_MSG_ERROR([GNUSTEP_SYSTEM_ROOT not defined. Probably you forgot to run the GNUstep initialization script first.])
!       else
! 	AC_MSG_RESULT([yes])
!       fi
  
!       # check for base.make in order to obtain compile flags
!       AC_CHECK_FILE([${GNUSTEP_MAKEFILES}/Additional/base.make],
! 			[use_gnustep_base=yes],
! 			[AC_MSG_ERROR(gnustep-base package not found)])
! 
!       # target specific stuff
!       case "$target_os" in
! 	   freebsd* | openbsd* )   
  		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  		LDFLAGS="$LDFLAGS -L/usr/local/lib";;
! 	   netbsd*)
  		CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
  		LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
!       esac
! 
!       FOO_GNUSTEP_OBJCFLAGS="\$(GNUSTEP_HEADERS_FLAGS) \$(AUXILIARY_OBJCFLAGS)"
!       FOO_GNUSTEP_INCLUDES="\$(GNUSTEP_HEADERS_FLAGS)"
!       FOO_GNUSTEP_LDFLAGS="\$(GNUSTEP_LIBRARIES_FLAGS)"
!    fi
  
     use_foundation="GNUstep"
!    AC_DEFINE(FOO_GNUSTEP, 1, Define whether we are using oldish GNUstep)
  
     # get rid of warnings regarding #import