* Lets try this again, retag of v0.0.6

Makefile.in

@@ -101,6 +101,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEVMAPPER_LIBS = @DEVMAPPER_LIBS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

config.h.in

@@ -18,6 +18,9 @@
    */
 #undef HAVE_ALLOCA_H
 
+/* Build with device-mapper support */
+#undef HAVE_DEVMAPPER
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H

configure

@@ -657,6 +657,7 @@ am__leading_dot
 AMTAR
 am__tar
 am__untar
+DEVMAPPER_LIBS
 CC
 CFLAGS
 LDFLAGS
@@ -1262,7 +1263,8 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-static         Build static versions of these utilities
+  --enable-static           Build static versions of these utilities
+  --enable-blkid-devmapper  Build with device-mapper support
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
 
@@ -2181,6 +2183,30 @@ if test "${enable_static+set}" = set; then
 fi
 
 
+# Check whether --enable-blkid-devmapper was given.
+if test "${enable_blkid_devmapper+set}" = set; then
+  enableval=$enable_blkid_devmapper;
+		if test "$enableval" = "no"
+		then
+			echo "Disabling device-mapper support"
+			DEVMAPPER_LIBS=''
+		else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DEVMAPPER
+_ACEOF
+
+			echo "Enabling device-mapper support"
+			DEVMAPPER_LIBS='/lib/libdevmapper.a'
+		fi
+
+else
+  echo "Disabling device-mapper support by default"
+
+fi
+
+
+
 
 # Checks for programs.
 ac_ext=c
@@ -7026,6 +7052,12 @@ fi
 done
 
 
+# Use devmapper
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DEVMAPPER 1
+_ACEOF
+
+
 ac_config_files="$ac_config_files Makefile libblkid/Makefile"
 
 
@@ -7716,6 +7748,7 @@ am__leading_dot!$am__leading_dot$ac_delim
 AMTAR!$AMTAR$ac_delim
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
+DEVMAPPER_LIBS!$DEVMAPPER_LIBS$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -7741,7 +7774,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

configure.ac

@@ -11,12 +11,29 @@ AC_GNU_SOURCE
 
 
 AC_ARG_ENABLE([static],
-	[  --enable-static         Build static versions of these utilities],
+	[  --enable-static           Build static versions of these utilities],
 	[
 		LDFLAGS="-static $LDFLAGS"
 		CFLAGS="-Os $CFLAGS"
 	])
 
+AC_ARG_ENABLE([blkid-devmapper],
+	[  --enable-blkid-devmapper  Build with device-mapper support],
+	[
+		if test "$enableval" = "no"
+		then
+			echo "Disabling device-mapper support"
+			DEVMAPPER_LIBS=''
+		else
+			AC_DEFINE([HAVE_DEVMAPPER], [], [Build with device-mapper support])
+			echo "Enabling device-mapper support"
+			DEVMAPPER_LIBS='/lib/libdevmapper.a'
+		fi
+	],
+	echo "Disabling device-mapper support by default"
+)
+AC_SUBST(DEVMAPPER_LIBS)
+
 
 # Checks for programs.
 AC_PROG_CC
@@ -49,6 +66,9 @@ AC_FUNC_MEMCMP
 AC_FUNC_STAT
 AC_CHECK_FUNCS([dup2 memset rmdir strchr strdup strerror strndup strrchr strstr strtol strtoul uname fstat64])
 
+# Use devmapper
+AC_DEFINE([HAVE_DEVMAPPER])
+
 AC_CONFIG_FILES([
 		 Makefile
 		 libblkid/Makefile

libblkid/Makefile.am

 noinst_LIBRARIES = libblkid.a
+libblkid_a_LIBADD = $(DEVMAPPER_LIBS)
 libblkid_a_SOURCES = \
 		blkid_types.h \
 		cache.c \
@@ -23,5 +24,5 @@ libblkid_a_SOURCES = \
 		uuid/unparse.c \
 		uuid/uuid_time.c \
 		uuid/uuid.h \
-		uuid/uuidP.h
+		uuid/uuidP.h 
 

libblkid/Makefile.in

@@ -47,7 +47,8 @@ LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
 libblkid_a_AR = $(AR) $(ARFLAGS)
-libblkid_a_LIBADD =
+am__DEPENDENCIES_1 =
+libblkid_a_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libblkid_a_OBJECTS = cache.$(OBJEXT) dev.$(OBJEXT) \
 	devname.$(OBJEXT) devno.$(OBJEXT) getsize.$(OBJEXT) \
 	llseek.$(OBJEXT) probe.$(OBJEXT) read.$(OBJEXT) \
@@ -84,6 +85,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEVMAPPER_LIBS = @DEVMAPPER_LIBS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -148,6 +150,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 noinst_LIBRARIES = libblkid.a
+libblkid_a_LIBADD = $(DEVMAPPER_LIBS)
 libblkid_a_SOURCES = \
 		blkid_types.h \
 		cache.c \
@@ -172,7 +175,7 @@ libblkid_a_SOURCES = \
 		uuid/unparse.c \
 		uuid/uuid_time.c \
 		uuid/uuid.h \
-		uuid/uuidP.h
+		uuid/uuidP.h 
 
 all: all-am