diff --git a/configure b/configure
index 58f56b00..1e8e9925 100755
--- a/configure
+++ b/configure
@@ -21509,6 +21509,197 @@ fi
 done
 
 
+# Check for declarations of constant bswap function as some systems do not
+# provide all of them.
+echo "$as_me:$LINENO: checking whether __bswap_constant_16 is declared" >&5
+echo $ECHO_N "checking whether __bswap_constant_16 is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl___bswap_constant_16+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <byteswap.h>
+
+int
+main ()
+{
+#ifndef __bswap_constant_16
+  char *p = (char *) __bswap_constant_16;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl___bswap_constant_16=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl___bswap_constant_16=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl___bswap_constant_16" >&5
+echo "${ECHO_T}$ac_cv_have_decl___bswap_constant_16" >&6
+if test $ac_cv_have_decl___bswap_constant_16 = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___BSWAP_CONSTANT_16 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___BSWAP_CONSTANT_16 0
+_ACEOF
+
+
+fi
+echo "$as_me:$LINENO: checking whether __bswap_constant_32 is declared" >&5
+echo $ECHO_N "checking whether __bswap_constant_32 is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl___bswap_constant_32+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <byteswap.h>
+
+int
+main ()
+{
+#ifndef __bswap_constant_32
+  char *p = (char *) __bswap_constant_32;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl___bswap_constant_32=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl___bswap_constant_32=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl___bswap_constant_32" >&5
+echo "${ECHO_T}$ac_cv_have_decl___bswap_constant_32" >&6
+if test $ac_cv_have_decl___bswap_constant_32 = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___BSWAP_CONSTANT_32 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___BSWAP_CONSTANT_32 0
+_ACEOF
+
+
+fi
+echo "$as_me:$LINENO: checking whether __bswap_constant_64 is declared" >&5
+echo $ECHO_N "checking whether __bswap_constant_64 is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl___bswap_constant_64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <byteswap.h>
+
+int
+main ()
+{
+#ifndef __bswap_constant_64
+  char *p = (char *) __bswap_constant_64;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl___bswap_constant_64=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl___bswap_constant_64=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl___bswap_constant_64" >&5
+echo "${ECHO_T}$ac_cv_have_decl___bswap_constant_64" >&6
+if test $ac_cv_have_decl___bswap_constant_64 = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___BSWAP_CONSTANT_64 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL___BSWAP_CONSTANT_64 0
+_ACEOF
+
+
+fi
+
+
+
 # Makefiles to be created by configure.
                                                                                                                                                                                                         ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec"