[foo-cvs] foo/libfoo configure.ac,1.4,1.5

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

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

Modified Files:
	configure.ac 
Log Message:
minor changes and cleanup to the build system

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/libfoo/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.ac	31 Jul 2004 07:01:21 -0000	1.4
--- configure.ac	31 Jul 2004 08:10:20 -0000	1.5
***************
*** 6,21 ****
  # $Id$
  
! AC_INIT(libfoo, 0.1.0, foo...@li...)
  
! AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR(autotools)
  AC_CANONICAL_TARGET([])
  
! AC_CONFIG_SRCDIR([include/FOOBreakpointFunction.h])
! 
! AM_INIT_AUTOMAKE(foo, 0.1.0)
! AM_CONFIG_HEADER(config.h)
  
! # SHARED_VERSION_INFO="0:1:0"
  
  # Find the compiler
--- 6,21 ----
  # $Id$
  
! AC_INIT(libfoo,0.1.0,foo...@li...)
  
! AC_PREREQ(2.53)
! AC_CONFIG_SRCDIR([src/FOOObject.m])
  AC_CONFIG_AUX_DIR(autotools)
  AC_CANONICAL_TARGET([])
+ AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ AM_CONFIG_HEADER(src/config.h)
  
! SHARED_VERSION_INFO="0:1:0"
  
! AC_CHECK_PROG(autogen, autogen, yes, no)
  
  # Find the compiler
***************
*** 26,30 ****
  AC_PROG_LIBTOOL
  
! # set objc stuff
  _AM_DEPENDENCIES([OBJC])
  
--- 26,30 ----
  AC_PROG_LIBTOOL
  
! # objc workaround due to missing objc support in autoconf
  _AM_DEPENDENCIES([OBJC])
  
***************
*** 51,55 ****
  
  # check for foundation library to use
- 
  # os dependent check
  case "${target_os}" in
--- 51,54 ----
***************
*** 58,67 ****
      enable_gnustep=no;
      ;;
!   *)
      enable_gnustep=yes;
  esac
  
  # check for OpenStep compatible foundation
! use_gs_base=no
  if test ${enable_gnustep} = yes; then
     # check for gnustep
--- 57,72 ----
      enable_gnustep=no;
      ;;
!   *linux*)
      enable_gnustep=yes;
+     ;;
+   *)
+     AC_MSG_WARN([Foo was not ported yet to another platform than linux or darwin!])
  esac
  
  # check for OpenStep compatible foundation
! use_gnustep_base=no
! FOO_GNUSTEP_OBJCFLAGS=""
! FOO_GNUSTEP_LDFLAGS=""
! 
  if test ${enable_gnustep} = yes; then
     # check for gnustep
***************
*** 78,82 ****
     # check for base.make in order to obtain compile flags
     AC_CHECK_FILE([${GNUSTEP_MAKEFILES}/Additional/base.make],
! 		 [use_gs_base=yes],
  		 [AC_MSG_ERROR(gnustep-base package not found)])
  
--- 83,87 ----
     # 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)])
  
***************
*** 92,95 ****
--- 97,103 ----
  
     use_foundation="GNUstep"
+    FOO_GNUSTEP_OBJCFLAGS="\$(GNUSTEP_HEADERS_FLAGS) \$(AUXILIARY_OBJCFLAGS)"
+    FOO_GNUSTEP_LDFLAGS="\$(GNUSTEP_LIBRARIES_FLAGS)"
+ 
  else
     # set flags for cocoa framework
***************
*** 98,102 ****
     use_foundation="Cocoa"
  fi
! AM_CONDITIONAL(USE_GS_BASE, test "$use_gs_base" = yes)
  
  # check for libsndfile
--- 106,110 ----
     use_foundation="Cocoa"
  fi
! AM_CONDITIONAL(USE_GNUSTEP_BASE, test "$use_gnustep_base" = yes)
  
  # check for libsndfile
***************
*** 122,125 ****
--- 130,134 ----
  
  # Export variables
+ AC_SUBST(SHARED_VERSION_INFO)
  AC_SUBST(FOO_CFLAGS)
  AC_SUBST(FOO_OBJCFLAGS)
***************
*** 127,130 ****
--- 136,141 ----
  AC_SUBST(FOO_LIBS)
  AC_SUBST(GNUSTEP_MAKEFILES)
+ AC_SUBST(FOO_GNUSTEP_OBJCFLAGS)
+ AC_SUBST(FOO_GNUSTEP_LDFLAGS)
  
  AC_OUTPUT([