[sword-cvs] sword/lib Makefile.am,1.7,1.8

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/lib
In directory www:/tmp/cvs-serv14222/lib

Modified Files:
	Makefile.am 
Log Message:

dglassey: fix build system to work with automake 1.6 again


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/lib/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	16 Jul 2002 22:53:49 -0000	1.7
--- Makefile.am	1 May 2003 10:59:45 -0000	1.8
***************
*** 1,6 ****
  AUTOMAKE_OPTIONS = 1.6
  INCLUDES = -I$(top_srcdir)/include
! DEFS += -DUSE_AUTOTOOLS
! 
  # Global config directory
  globalconfdir := @sysconfdir@
--- 1,5 ----
  AUTOMAKE_OPTIONS = 1.6
  INCLUDES = -I$(top_srcdir)/include
! INCLUDES += -DUSE_AUTOTOOLS -DUNIX
  # Global config directory
  globalconfdir := @sysconfdir@
***************
*** 10,17 ****
  libsword_la_SOURCES =
  if ICU
! libsword_la_LIBADD = -licui18n -licuuc -lustdio
  else
! libsword_la_LIBADD =
  endif
  libsword_la_LDFLAGS = -version-info 1
  
--- 9,18 ----
  libsword_la_SOURCES =
  if ICU
! ICULIBADD = -licui18n -licuuc -lustdio
  else
! ICULIBADD =
  endif
+ libsword_la_LIBADD = $(ICULIBADD)
+ 
  libsword_la_LDFLAGS = -version-info 1
  
***************
*** 23,25 ****
--- 24,27 ----
  include ../bindings/Makefile.am
  include ../include/Makefile.am
+