[foo-cvs] foo/elkfoo configure.ac,1.6,1.7

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

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

Modified Files:
	configure.ac 
Log Message:
fixed elkfoo binary build params

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.ac	5 Aug 2004 23:15:35 -0000	1.6
--- configure.ac	6 Aug 2004 02:53:47 -0000	1.7
***************
*** 101,104 ****
--- 101,105 ----
     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)"
  
***************
*** 210,214 ****
  if test -z "${RECURSIVE_BUILD}"; then
     AC_MSG_WARN([ommitting check for libfoo])
!    ELKFOO_LIBS="${ELKFOO_LIBS} -lfoo"
  
  dnl    AC_LANG_PUSH(Objective C)
--- 211,215 ----
  if test -z "${RECURSIVE_BUILD}"; then
     AC_MSG_WARN([ommitting check for libfoo])
!    ELKFOO_EXT_LIBS="${ELKFOO_EXT_LIBS} -lfoo"
  
  dnl    AC_LANG_PUSH(Objective C)
***************
*** 218,222 ****
  dnl       AC_CHECK_LIB([foo], [main])
  dnl       if test "${ac_cv_lib_foo_main}" = yes; then
! dnl 	ELKFOO_LIBS="${ELKFOO_LIBS} -lfoo"
  dnl    else
  dnl         have_libfoo=no
--- 219,223 ----
  dnl       AC_CHECK_LIB([foo], [main])
  dnl       if test "${ac_cv_lib_foo_main}" = yes; then
! dnl 	ELKFOO_EXT_LIBS="${ELKFOO_EXT_LIBS} -lfoo"
  dnl    else
  dnl         have_libfoo=no
***************
*** 234,238 ****
  else
    INCLUDES="-I\$(top_srcdir)/../libfoo -I\$(top_builddir)/../libfoo ${INCLUDES}"
!   ELKFOO_LIBS="${ELKFOO_LIBS} \$(top_builddir)/../libfoo/src/libfoo.la"
  fi
  
--- 235,239 ----
  else
    INCLUDES="-I\$(top_srcdir)/../libfoo -I\$(top_builddir)/../libfoo ${INCLUDES}"
!   ELKFOO_EXT_LIBS="${ELKFOO_EXT_LIBS} \$(top_builddir)/../libfoo/src/libfoo.la"
  fi
  
***************
*** 249,254 ****
--- 250,257 ----
  AC_SUBST(ELKFOO_LDFLAGS)
  AC_SUBST(ELKFOO_LIBS)
+ AC_SUBST(ELKFOO_EXT_LIBS)
  AC_SUBST(GNUSTEP_MAKEFILES)
  AC_SUBST(FOO_GNUSTEP_OBJCFLAGS)
+ AC_SUBST(FOO_GNUSTEP_INCLUDES)
  AC_SUBST(FOO_GNUSTEP_LDFLAGS)
  AC_SUBST(ELK_LIBRARY)