[bt-devel] sword.m4 suggested patch

[Daniel Glassey]

--=-WM4MTyhG9y7ZFe3L5VbY
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi guys,
In sword.m4 it checks for sword headers and lib in directories other
than what is specified by configure. It is unlikely but this could lead
to confusion/bugs if people somehow end up with a lib in the right place
but old headers somewhere else.
The patch just makes it check where you tell it to (with the default of
/usr)

Does this make sense and what do you think?

Regards,
Daniel

--=-WM4MTyhG9y7ZFe3L5VbY
Content-Disposition: attachment; filename=swm4.diff
Content-Type: text/x-patch; name=swm4.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: sword.m4
===================================================================
RCS file: /cvsroot/bibletime/bibletime/sword.m4,v
retrieving revision 1.10
diff -u -w -r1.10 sword.m4
--- sword.m4	22 Jun 2003 10:49:30 -0000	1.10
+++ sword.m4	19 Dec 2003 11:57:12 -0000
@@ -28,7 +28,7 @@
 dnl try to find Sword library files
 AC_MSG_CHECKING([for Sword library files])
 AC_REQUIRE([AC_FIND_ZLIB])
-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+ac_sword_library_dirs="$ac_sword_dir/lib"
 
 if test "x$ac_static_sword" = "xYES"; then
 	SEARCH_LIBS="libsword.a";
@@ -62,7 +62,7 @@
 
 dnl -- try to find Swords include files --
 AC_MSG_CHECKING([for Sword include files])
-ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
+ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include"
 
 AC_CACHE_VAL(ac_cv_sword_incdir, AC_FIND_FILE(swmgr.h, $ac_sword_include_dirs, ac_cv_sword_incdir))
 

--=-WM4MTyhG9y7ZFe3L5VbY--