X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=aa0fac34a6b8af3f10fdac8c65ea98cc711e53ee;hb=999120147ad5227719d8eef73bd87a976efbe1a3;hp=d4f879eb5f6f5d1664348fc728b9571a9555e3c4;hpb=135987a501181a84ffe5f1559a670ca8db57428c;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index d4f879eb..aa0fac34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,23 +42,7 @@ AC_PROG_MAKE_SET
 LT_INIT
 
 ## Checks for libraries.
-AC_CHECK_LIB([dl], [dlopen],
-[
-	have_libdl=yes
-],
-[
-	#libdl not found, check for dlopen in libc.
-	AC_CHECK_LIB([c], [dlopen],
-	[
-		have_libc_dl=yes
-	],
-	[
-		AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
-	])
-])
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
-
+AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 
 # Check for libuuid
@@ -75,7 +59,7 @@ AC_CHECK_LIB([uuid], [uuid_generate],
 		have_libc_uuid=yes
 	],
 	[
-		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify its location.])
 	])
 ]
 )
@@ -175,7 +159,6 @@ changequote([,])dnl
 	  fi
 	  ;;
 	x86_64) LIBFORMAT="elf64-x86-64" ;;
-	amd64) LIBFORMAT="elf64-x86-64" ;;
 	powerpc) LIBFORMAT="elf32-powerpc" ;;
 	ppc64) LIBFORMAT="elf64-powerpc" ;;
 	powerpc64) LIBFORMAT="elf64-powerpc" ;;