[patch] parted.m4

[Neal H Walfield]

This updates the parted.m4 file.  It fixes a few bugs (quoting), checks
for all libraries required and changes the name of the function to
something more standard.

Here is a change log entry:

2001-08-17  Neal H Walfield  <address@hidden>

        * parted.m4: Rename AM_PATH_PARTED to AC_CHECK_LIBPARTED.
        (AC_CHECK_LIBPARTED): Do proper quoting.
        [host_os=gnu]: Check for libshouldbeinlibc and libstore.
        Set PARTED_LIBS to detected libraries.


--- parted-1.5.4-pre1.orig/parted.m4    Sun Apr  8 00:34:30 2001
+++ parted-1.5.4-pre1/parted.m4 Fri Aug 17 00:48:19 2001
@@ -2,29 +2,50 @@
 # written by Damien Genet <address@hidden>
 
 dnl Usage:
-dnl AM_PATH_PARTED([MINIMUM-VERSION, [ACTION-IF-FOUND [, 
ACTION-IF-NOT-FOUND]]])
+dnl AC_CHECK_LIBPARTED([MINIMUM-VERSION, [ACTION-IF-FOUND [, 
ACTION-IF-NOT-FOUND]]])
 dnl where MINIMUM-VERSION must be >= 1.2.8 and != 1.3.0
 dnl
 dnl Example:
-dnl AM_PATH_PARTED(1.2.8, , AC_MSG_ERROR([*** libparted >= 1.2.8 not installed 
- please install first ***]))
+dnl AC_CHECK_PARTED(1.2.8, , [AC_MSG_ERROR([*** libparted >= 1.2.8 not 
installed - please install first ***])])
 dnl
-dnl Add -lparted to @PARTED_LIBS@ 
+dnl Adds the required libraries to $PARTED_LIBS and does an
+dnl AC_SUBST(PARTED_LIBS)
 dnl
 
 
-AC_DEFUN(AM_PATH_PARTED,
+AC_DEFUN(AC_CHECK_LIBPARTED,
 [
 
 dnl save LIBS
 saved_LIBS="$LIBS"
 
 dnl Check for headers and library
-AC_CHECK_HEADER(parted/parted.h,,
-            AC_MSG_ERROR([*** libparted headers not found - please install 
libparted ***])
-            $3)
-AC_HAVE_LIBRARY(parted,,
-                AC_MSG_ERROR([*** libparted not found - please install 
libparted ***])
+AC_CHECK_HEADER(parted/parted.h, ,
+               [AC_MSG_ERROR([<parted/parted.h> not found; install 
GNU/Parted])]
+               $3)
+AC_CHECK_LIB(uuid, uuid_generate, ,
+            [AC_MSG_ERROR([libuuid not found; install e2fsprogs])]
+             $3)
+AC_CHECK_LIB(parted,ped_device_read, ,
+             [AC_MSG_ERROR([libparted not found; install GNU/Parted])]
+             $3)
+
+AC_CANONICAL_HOST
+case "$host_os" in
+       gnu*)   # The Hurd requires some special system libraries
+               # with very generic names, which is why we special
+               # case these tests.
+
+               AC_CHECK_LIB(shouldbeinlibc,lcm, ,
+                       [AC_MSG_ERROR([libshouldbeinlibc not found; Is this 
really the Hurd?])]
+                $3)
+
+               AC_CHECK_LIB(store,store_open, ,
+                       [AC_MSG_ERROR([libstore not found; Is this really the 
Hurd?])]
                 $3)
+               ;;
+       *)      ;;
+esac
 
 AC_MSG_CHECKING(for libparted - version >= $1)
 
@@ -79,8 +100,8 @@ int main ()
     [echo $ac_n "cross compiling; assumed OK... $ac_c"])
 
 dnl restore orignial LIBS and set @PARTED_LIBS@
+PARTED_LIBS="$LIBS"
 LIBS="$saved_LIBS"
-PARTED_LIBS="-lparted"
 AC_SUBST(PARTED_LIBS)
 
 dnl Execute ACTION-IF-FOUND

pgpfk1R98irIN.pgp
Description: PGP signature