bootstrap: Standardize on autoreconf -vi

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7b82d363d383ea483f6d2a59a9a1da6192f941d1..a2f82bd9defa44a673f97812caf4fb777c6941d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -142,29 +142,40 @@ AS_CASE([$host_os],
 
 AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
 
-# Check for libuuid
-AC_CHECK_LIB([uuid], [uuid_generate],
+# Check what libraries are required on this platform to link sockets programs.
+AX_LIB_SOCKET_NSL
+
+# Check for uuid in system libs
+AC_CHECK_FUNCS([uuid_generate],
 [
-       AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
-       have_libuuid=yes
+  AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
+  link_with_libuuid=no
 ],
 [
-       # libuuid not found, check for uuid_create in libc.
-       AC_CHECK_LIB([c], [uuid_create],
-       [
-               AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
-               have_libc_uuid=yes
-       ],
-       [
-               # for MinGW32 we have our own internal implemenation of uuid using Windows functions.
-               if test "x$MINGW32" = xno; then
-                       AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
-               fi
-       ])
-]
-)
-AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
-AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
+  # Check for libuuid
+  AC_CHECK_LIB([uuid], [uuid_generate],
+  [
+    AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
+    link_with_libuuid=yes
+  ],
+  [
+    # libuuid not found, check for uuid_create in libc.
+    AC_CHECK_LIB([c], [uuid_create],
+    [
+      AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
+      link_with_libc_uuid=yes
+    ],
+    [
+      # for MinGW32 we have our own internal implemenation of uuid using Windows functions.
+      if test "x$MINGW32" = xno; then
+        AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+      fi
+    ])
+  ])
+])
+
+AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$link_with_libuuid" = "xyes"])
+AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBC_UUID], [test "x$link_with_libc_uuid" = "xyes"])
 
 # Check for fmemopen
 AC_CHECK_LIB([c], [fmemopen],
@@ -239,11 +250,16 @@ else
 
 fi
 
-# Optional debuginfo feature (enabled by default)
-AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes],
-    [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], [], [enable_debuginfo=yes])],
-    [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])], [], [enable_debuginfo=no])]
-)
+# Set default enable state for debug info
+AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no])
+
+# Optional debuginfo feature
+# Do _not_ indent the help string below (appears in the configure --help
+# output).
+AC_ARG_ENABLE([debug-info],
+[AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])]
+[AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])],
+       [AS_IF([test "x$enableval" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no])], [])
 
 AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])
 AS_IF([test "x$enable_debuginfo" = xyes], [