X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=2d691572cae369b5b021bdda85843ce683f37bba;hp=cc8137ef26f78278c549dd04593b17935b5c4dba;hb=a338400183fc8cb574c5750ed4c6b22a5f6fd044;hpb=572eed315d3d848cb336d8f51098038377434377

diff --git a/configure.in b/configure.in
index cc8137e..2d69157 100644
--- a/configure.in
+++ b/configure.in
@@ -113,7 +113,6 @@ AC_ARG_ENABLE([ermt],
 if test "$enableval" = "no"
 then
 	ERMT=""
-	CRYPTO=""
 	echo "Not compiling ermt"
 else
 	if test "$RMTDIR" = ""
@@ -121,16 +120,13 @@ else
 		AC_MSG_ERROR(ermt requires --enable-rmt)
 	fi
 	ERMT="ermt"
-	CRYPTO="-lcrypto"
 	echo "Compiling ermt"
 fi
 ,
 ERMT=""
-CRYPTO=""
 echo "Not compiling ermt by default"
 )
 AC_SUBST(ERMT)
-AC_SUBST(CRYPTO)
 
 dnl
 dnl Handle --enable-kerberos
@@ -411,8 +407,11 @@ dnl
 dnl Check for Ext2fs headers and libraries
 dnl
 AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-])
-AC_CHECK_LIB(ext2fs, ext2fs_open, [ext2fs_lib=yes], [ext2fs_lib=no], [-lcom_err])
-if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then
+PKG_CHECK_MODULES(EXT2FS, [ext2fs])
+if test -n "$STATIC" ; then
+	EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs`
+fi
+if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
 	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
 fi
 
@@ -465,11 +464,17 @@ dnl
 dnl Check for blkid headers libraries
 dnl
 AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-])
-AC_CHECK_LIB(blkid, blkid_get_devname, [blkid_lib=yes], [blkid_lib=no], [-luuid])
-if test "$blkid_h" = yes -a "$blkid_lib" = yes; then
-	AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
-	BLKID="-lblkid -luuid"
-fi
+PKG_CHECK_EXISTS([blkid],
+	[
+	if test -n $STATIC ; then
+		BLKID=`$PKG_CONFIG --libs --static blkid`
+	else
+		BLKID=`$PKG_CONFIG --libs blkid`
+	fi
+	if test "$blkid_h" = yes ; then
+		AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
+	fi
+	],[BLKID=""])
 AC_SUBST(BLKID)
 
 dnl
@@ -527,7 +532,7 @@ dnl
 dnl Check for zlib headers and libraries
 dnl
 AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no], [-])
-AC_CHECK_LIB(z, compress2, [zlib_lib=yes], [zlib_lib=no])
+AC_CHECK_LIB(z, zlibVersion, [zlib_lib=yes], [zlib_lib=no])
 if test "$zlib_h" = yes -a "$zlib_lib" = yes; then
 	if test "$STATICZ" = yes; then
 		ZLIB="-Wl,-Bstatic -lz -Wl,-Bdynamic"
@@ -591,10 +596,19 @@ dnl
 if test "$ERMT" != ""; then
 	AC_CHECK_HEADER(openssl/evp.h, [evp_h=yes], [evp_h=no])
 	AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_set_padding, [crypto_lib=yes], [crypto_lib=no])
-	if test "$evp_h" = no -o "$crypto_lib" = no; then
+	PKG_CHECK_EXISTS([libcrypto],
+		[
+		if test -n $STATIC ; then
+			CRYPTO=`$PKG_CONFIG --libs --static libcrypto`
+		else
+			CRYPTO=`$PKG_CONFIG --libs libcrypto`
+		fi
+		],[CRYPTO=""])
+	if test "$evp_h" = no -o "x$CRYPTO" = "x"; then
 		AC_MSG_ERROR(You need to install the OpenSSL library (version 0.9.7a or later), or configure without --enable-ermt)
 	fi
 fi
+AC_SUBST(CRYPTO)
 
 dnl
 dnl Check for types