[Netatalk-cvs] netatalk/macros db3-check.m4,1.18,1.19

[franklahm <fra...@us...>]

Update of /cvsroot/netatalk/netatalk/macros
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26911/macros

Modified Files:
	db3-check.m4 
Log Message:
Add cross-compilation support

Index: db3-check.m4
===================================================================
RCS file: /cvsroot/netatalk/netatalk/macros/db3-check.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** db3-check.m4	21 Apr 2009 08:55:44 -0000	1.18
--- db3-check.m4	3 Jul 2009 08:15:19 -0000	1.19
***************
*** 29,37 ****
      maj=$atalk_cv_bdb_MAJOR
      min=$atalk_cv_bdb_MINOR
!     atalk_cv_bdb_try_libs="-ldb$maj$min -ldb$maj.$min -ldb-$maj$min -ldb-$maj.$min"
  
      for lib in $atalk_cv_bdb_try_libs ; do
!         LIBS="$lib $savedlibs"
!         AC_MSG_CHECKING([Berkeley DB library ($lib)])
          AC_TRY_RUN([
              #include <stdio.h>
--- 29,37 ----
      maj=$atalk_cv_bdb_MAJOR
      min=$atalk_cv_bdb_MINOR
!     atalk_cv_bdb_try_libs="db$maj$min db$maj.$min db-$maj$min db-$maj.$min"
  
      for lib in $atalk_cv_bdb_try_libs ; do
!         LIBS="-l$lib $savedlibs"
!         AC_MSG_CHECKING([Berkeley DB library (-l$lib)])
          AC_TRY_RUN([
              #include <stdio.h>
***************
*** 54,64 ****
              }
          ],[
- 
              AC_MSG_RESULT(yes)
              atalk_cv_bdb_version="yes"
!             atalk_cv_lib_db="$lib"
              break
          ],[
              AC_MSG_RESULT(no)
          ])
      done
--- 54,78 ----
              }
          ],[
              AC_MSG_RESULT(yes)
              atalk_cv_bdb_version="yes"
!             atalk_cv_lib_db="-l$lib"
              break
          ],[
              AC_MSG_RESULT(no)
+         ],[
+             bdblibs=`ls $bdblibdir/lib$lib.* 2>/dev/null`
+             for bdblib in $bdblibs ; do
+                 echo "Testing for lib file $bdblib" >&AS_MESSAGE_LOG_FD
+                 if test -f "$bdblib" ; then
+                     AC_MSG_RESULT([yes (cross-compiling)])
+                     atalk_cv_bdb_version="yes"
+                     atalk_cv_lib_db="-l$lib"
+                     break
+                 fi
+             done
+             if test "x$atalk_cv_bdb_version" = "xyes" ; then
+                 break
+             fi
+             AC_MSG_RESULT([no (cross-compiling)])
          ])
      done