--- configure.orig	Tue Apr 13 09:47:26 2004
+++ configure	Fri Apr 16 01:07:19 2004
@@ -8687,9 +8687,9 @@
 
 
 
-echo "$as_me:$LINENO: checking for png_libpng_ver in -lpng" >&5
-echo $ECHO_N "checking for png_libpng_ver in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_libpng_ver+set}" = set; then
+echo "$as_me:$LINENO: checking for png_get_header_ver in -lpng" >&5
+echo $ECHO_N "checking for png_get_header_ver in -lpng... $ECHO_C" >&6
+if test "${ac_cv_lib_png_png_get_header_ver+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8707,11 +8707,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char png_libpng_ver ();
+char png_get_header_ver ();
 int
 main ()
 {
-png_libpng_ver ();
+png_get_header_ver ();
   ;
   return 0;
 }
@@ -8738,20 +8738,20 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_png_png_libpng_ver=yes
+  ac_cv_lib_png_png_get_header_ver=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_png_png_libpng_ver=no
+ac_cv_lib_png_png_get_header_ver=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_libpng_ver" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_libpng_ver" >&6
-if test $ac_cv_lib_png_png_libpng_ver = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_header_ver" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_get_header_ver" >&6
+if test $ac_cv_lib_png_png_get_header_ver = yes; then
   CFLAGS="$CFLAGS -DHAVE_LIBPNG" LDFLAGS="$LDFLAGS -lpng"
 fi
 
@@ -8983,7 +8983,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb  $LIBS"
+LIBS="-ldb41 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9042,7 +9042,7 @@
 echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_create" >&5
 echo "${ECHO_T}$ac_cv_lib_db_db_create" >&6
 if test $ac_cv_lib_db_db_create = yes; then
-  LDFLAGS="$LDFLAGS -ldb" DATABASE="db"
+  LDFLAGS="$LDFLAGS -ldb41" DATABASE="db"
 else
   echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
@@ -9142,7 +9142,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb  $LIBS"
+LIBS="-ldb41 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9201,7 +9201,7 @@
 echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_create" >&5
 echo "${ECHO_T}$ac_cv_lib_db_db_create" >&6
 if test $ac_cv_lib_db_db_create = yes; then
-  LDFLAGS="$LDFLAGS -ldb" DATABASE="db"
+  LDFLAGS="$LDFLAGS -ldb41" DATABASE="db"
 cat >>confdefs.h <<\_ACEOF
 #define USE_DB
 _ACEOF
