Several fixes for autoconf and Linux init scripts

autoconf: remove (yet another) brctl leftover

autoconf: remove ip check

ip is a run-time dependency, and it is not needed to build Xen tools.

Roger Pau Monne writes ("[Xen-devel] [PATCH 2 of 8 v2] autoconf: remove ip check"):

Quoted 3 lines

autoconf: remove ip check

ip is a run-time dependency, and it is not needed to build Xen tools.

Acked-by Ian Jackson <[email protected]>

Committed-by Ian Jackson <[email protected]>

(I fixed up a minor conflict.)

autoconf: remove python xml check

Roger Pau Monne writes ("[Xen-devel] [PATCH 4 of 8 v2] autoconf: run libuuid test under Linux only"):

Quoted 5 lines

autoconf: run libuuid test under Linux only +AS_IF([test "x$host_os" == "xlinux-gnu"], [
+    AC_CHECK_LIB([uuid], [uuid_clear], [],
+        [AC_MSG_ERROR([Could not find libuuid])]) +])

This seems odd to me.  Where does this linux-specificity come from ?

2012/3/1 Ian Jackson <[email protected]>:

Quoted 7 lines

Roger Pau Monne writes ("[Xen-devel] [PATCH 4 of 8 v2] autoconf: run libuuid test under Linux only"):

Quoted 5 lines

autoconf: run libuuid test under Linux only

(quoted diff) +4 -0

+AS_IF([test "x$host_os" == "xlinux-gnu"], [
+    AC_CHECK_LIB([uuid], [uuid_clear], [],
+        [AC_MSG_ERROR([Could not find libuuid])])
+])

Quoted 2 lines

This seems odd to me. Where does this linux-specificity come from ?

-luuid is only used when building under Linux (see tools/libxl/Makefile for example), NetBSD uuid lib is different from linux, and doesn't require the -luuid flag to link, it doesn't even have the same API. Since we already check for different uuid headers in Linux/NetBSD, what about this:

8<--------------------------------------------

autoconf: run libuuid test under Linux only

libuuid is only required to compile Xen tools under Linux, move the lib check together with the headers check. Also fixed a couple of hard tabs in tools/m4/uuid.m4.

Signed-off-by Roger Pau Monne <[email protected]>

diff -r a41d13f080d9 tools/configure

tools/configure +1 -0

@@ -6330,6 +6330,53 @@ else
 fi
 
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear

in -luuid" >&5
+$as_echo_n "checking for uuid_clear in -luuid... " >&6; }

tools/configure +33 -0

+if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char uuid_clear ();
+int
+main ()
+{
+return uuid_clear ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_uuid_uuid_clear=yes
+else
+  ac_cv_lib_uuid_uuid_clear=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:

$ac_cv_lib_uuid_uuid_clear" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_clear" >&6; }

tools/configure +11 -0

+if test "x$ac_cv_lib_uuid_uuid_clear" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUUID 1
+_ACEOF
+
+  LIBS="-luuid $LIBS"
+
+else
+  as_fn_error $? "cannot find libuuid" "$LINENO" 5
+fi
+
 else
     ac_fn_c_check_header_mongrel "$LINENO" "uuid.h"

"ac_cv_header_uuid_h" "$ac_includes_default"
if test "x$ac_cv_header_uuid_h" = x""yes; then :

tools/configure +0 -35

@@ -6826,53 +6873,6 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
-$as_echo_n "checking for uuid_clear in -luuid... " >&6; }
-if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-luuid  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char uuid_clear ();
-int
-main ()
-{
-return uuid_clear ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_uuid_uuid_clear=yes
-else
-  ac_cv_lib_uuid_uuid_clear=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:

$ac_cv_lib_uuid_uuid_clear" >&5
-$as_echo "$ac_cv_lib_uuid_uuid_clear" >&6; }

tools/configure +0 -11

-if test "x$ac_cv_lib_uuid_uuid_clear" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUUID 1
-_ACEOF
-
-  LIBS="-luuid $LIBS"
-
-else
-  as_fn_error $? "Could not find libuuid" "$LINENO" 5
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5
 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
 if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then :

diff -r a41d13f080d9 tools/configure.ac

tools/configure.ac +0 -2

@@ -118,8 +118,6 @@ AC_SUBST(libgcrypt)
 AC_CHECK_LIB([pthread], [pthread_create], [] ,
     [AC_MSG_ERROR([Could not find libpthread])])
 AC_CHECK_LIB([rt], [clock_gettime])
-AC_CHECK_LIB([uuid], [uuid_clear], [],
-    [AC_MSG_ERROR([Could not find libuuid])])
 AC_CHECK_LIB([yajl], [yajl_alloc], [],
     [AC_MSG_ERROR([Could not find yajl])])
 AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])

diff -r a41d13f080d9 tools/m4/uuid.m4

tools/m4/uuid.m4 +4 -2

@@ -2,9 +2,11 @@ AC_DEFUN([AX_CHECK_UUID],
 [if test "x$host_os" == "xlinux-gnu"
 then
     AC_CHECK_HEADER([uuid/uuid.h],,
-	    [AC_MSG_ERROR([cannot find uuid headers])])
+        [AC_MSG_ERROR([cannot find uuid headers])])
+    AC_CHECK_LIB([uuid], [uuid_clear], [],
+        [AC_MSG_ERROR([cannot find libuuid])])
 else
     AC_CHECK_HEADER([uuid.h],,
-	    [AC_MSG_ERROR([cannot find uuid headers])])
+        [AC_MSG_ERROR([cannot find uuid headers])])
 fi
 ])

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

Quoted 8 lines

2012/3/1 Ian Jackson <[email protected]>:

Quoted 7 lines

Roger Pau Monne writes ("[Xen-devel] [PATCH 4 of 8 v2] autoconf: run libuuid test under Linux only"):

Quoted 5 lines

autoconf: run libuuid test under Linux only +AS_IF([test "x$host_os" == "xlinux-gnu"], [
+    AC_CHECK_LIB([uuid], [uuid_clear], [],
+        [AC_MSG_ERROR([Could not find libuuid])]) +])

Quoted 8 lines

Quoted 2 lines

This seems odd to me.  Where does this linux-specificity come from ?

-luuid is only used when building under Linux (see tools/libxl/Makefile for example), NetBSD uuid lib is different from linux, and doesn't require the -luuid flag to link, it doesn't even have the same API. Since we already check for different uuid headers in Linux/NetBSD, what about this:

Shouldn't this test also be checking for "Linux-like" or "BSD-like" UUID interfaces, rather than checking specifically for those OSes directly. We don't really care what the OS is, just which of the uuid interfaces it happens to provide.

Such a change may well propagate to more than the configure script though and your patch seems like a valid fix to the status quo so:

Acked-by Ian Campbell <[email protected]>

(note that IanJ is away until 12 March)

Quoted 156 lines

8<--------------------------------------------

autoconf: run libuuid test under Linux only

libuuid is only required to compile Xen tools under Linux, move the lib check together with the headers check. Also fixed a couple of hard tabs in tools/m4/uuid.m4.

Signed-off-by Roger Pau Monne <[email protected]>

diff -r a41d13f080d9 tools/configure

tools/configure Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure Wed Feb 22 04:15:33 2012 +0100 +0 -0

@@ -6330,6 +6330,53 @@ else

 fi

+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
+$as_echo_n "checking for uuid_clear in -luuid... " >&6; }

tools/configure Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure Wed Feb 22 04:15:33 2012 +0100 +33 -0

+if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char uuid_clear ();
+int
+main ()
+{
+return uuid_clear ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_uuid_uuid_clear=yes
+else
+  ac_cv_lib_uuid_uuid_clear=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:

$ac_cv_lib_uuid_uuid_clear" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_clear" >&6; }

tools/configure Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure Wed Feb 22 04:15:33 2012 +0100 +11 -0

+if test "x$ac_cv_lib_uuid_uuid_clear" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUUID 1
+_ACEOF
+
+  LIBS="-luuid $LIBS"
+
+else
+  as_fn_error $? "cannot find libuuid" "$LINENO" 5
+fi
+

 else
     ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default" if test "x$ac_cv_header_uuid_h" = x""yes; then :

tools/configure Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure Wed Feb 22 04:15:33 2012 +0100 +0 -0

@@ -6826,53 +6873,6 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
 

 fi

tools/configure Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure Wed Feb 22 04:15:33 2012 +0100 +0 -35

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_clear in -luuid" >&5
-$as_echo_n "checking for uuid_clear in -luuid... " >&6; }
-if test "${ac_cv_lib_uuid_uuid_clear+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-luuid  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char uuid_clear ();
-int
-main ()
-{
-return uuid_clear ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_uuid_uuid_clear=yes
-else
-  ac_cv_lib_uuid_uuid_clear=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:

$ac_cv_lib_uuid_uuid_clear" >&5
-$as_echo "$ac_cv_lib_uuid_uuid_clear" >&6; }

tools/configure Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure Wed Feb 22 04:15:33 2012 +0100 +0 -11

-if test "x$ac_cv_lib_uuid_uuid_clear" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUUID 1
-_ACEOF
-
-  LIBS="-luuid $LIBS"
-
-else
-  as_fn_error $? "Could not find libuuid" "$LINENO" 5
-fi
-

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5 $as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
 if test "${ac_cv_lib_yajl_yajl_alloc+set}" = set; then :
diff -r a41d13f080d9 tools/configure.ac

tools/configure.ac      Wed Feb 22 14:54:22 2012 +0100 renamed from tools/configure.ac      Wed Feb 22 04:15:33 2012 +0100 +0 -2

@@ -118,8 +118,6 @@ AC_SUBST(libgcrypt)
  AC_CHECK_LIB([pthread], [pthread_create], [] ,
      [AC_MSG_ERROR([Could not find libpthread])])
  AC_CHECK_LIB([rt], [clock_gettime])
-AC_CHECK_LIB([uuid], [uuid_clear], [],
-    [AC_MSG_ERROR([Could not find libuuid])])
  AC_CHECK_LIB([yajl], [yajl_alloc], [],
      [AC_MSG_ERROR([Could not find yajl])])
  AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])

diff -r a41d13f080d9 tools/m4/uuid.m4

tools/m4/uuid.m4        Wed Feb 22 14:54:22 2012 +0100 renamed from tools/m4/uuid.m4        Wed Feb 22 04:15:33 2012 +0100 +0 -0

@@ -2,9 +2,11 @@ AC_DEFUN([AX_CHECK_UUID],

 [if test "x$host_os" == "xlinux-gnu"
 then
     AC_CHECK_HEADER([uuid/uuid.h],,
-         [AC_MSG_ERROR([cannot find uuid headers])])
+        [AC_MSG_ERROR([cannot find uuid headers])])
+    AC_CHECK_LIB([uuid], [uuid_clear], [],
+        [AC_MSG_ERROR([cannot find libuuid])]) else
     AC_CHECK_HEADER([uuid.h],,
-         [AC_MSG_ERROR([cannot find uuid headers])])
+        [AC_MSG_ERROR([cannot find uuid headers])]) fi
 ])

Quoted 4 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

I think this is a better approach. Now that we have autoconf, we could also get rid of a lot of Makefile and header OS contionals.

autoconf: check for uuid.h or uuid/uuid.h with -luuid

Check for uuid/uuid.h and if found check for -luuid usability (Linux case), if not, check for uuid.h (NetBSD). One of this tests has to succeed to be able to build Xen tools.

as_fn_error $? "Unable to find xgettext, please install xgettext"
"$LINENO" 5

Roger Pau Monné writes ("Re: [Xen-devel] [PATCH 4 of 8 v2] autoconf: run libuuid test under Linux only"):

Quoted 5 lines

autoconf: check for uuid.h or uuid/uuid.h with -luuid

Check for uuid/uuid.h and if found check for -luuid usability (Linux case), if not, check for uuid.h (NetBSD). One of this tests has to succeed to be able to build Xen tools.

...

Quoted 2 lines

     as_fn_error $? "Unable to find xgettext, please install xgettext" "$LINENO" 5

This has been linewrapped.

Ian.

-luuid is only used when building under Linux (see tools/libxl/Makefile for example), NetBSD uuid lib is different from linux, and doesn't require the -luuid flag to link, it doesn't even have the same API. Since we already check for different uuid headers in Linux/NetBSD, what about this:

Linux/init: include init-functions on xencommons and xend

Try to include /lib/lsb/init-functions on xencommons and xend or fail with and error message. Later patches make use of the functions present on this file.

Linux/init: check for brctl and ip at xencommons

Linux/init: check for udev >= 59 at xencommons

Check for udev at xencommons, since hotplug scripts use it.

Linux/init: check for xml.dom.minidom at xend init script