From edfabad8a15a050d7c0deae463d07da8f3a0965f Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Wed, 14 Oct 2015 16:24:01 -0500 Subject: [PATCH] Add libintl, libuuid dependencies to allow parted static link (#12) libparted requires libuuid; both require libintl. Static builds currently fail with link errors due to these missing dependencies. --- configure.ac | 4 +++- src/Makefile.am | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 375c775..78f6624 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,9 @@ PKG_CHECK_MODULES( )] ) -AC_CHECK_LIB([parted], [ped_device_probe_all], ,[AC_MSG_ERROR([parted development library not found])]) +AC_CHECK_LIB([intl], [libintl_dgettext]) # needed to statically link libparted, but not given in its pkgconfig file +AC_CHECK_LIB([uuid], [uuid_generate]) # needed to statically link libparted, but not given in its pkgconfig file +PKG_CHECK_MODULES([PARTED], [libparted]) AC_CHECK_LIB([pthread], [main], ,[AC_MSG_ERROR([pthread development library not found])]) # Checks for header files. diff --git a/src/Makefile.am b/src/Makefile.am index c123372..a5f5740 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,3 +7,5 @@ AM_LDFLAGS = # the previous manual Makefile bin_PROGRAMS = nwipe nwipe_SOURCES = context.h isaac_rand.c logging.h options.h prng.h nwipe.c gui.c isaac_rand.h method.h pass.c device.c gui.h isaac_standard.h mt19937ar-cok.c nwipe.h mt19937ar-cok.h pass.h device.h logging.c method.c options.c prng.c version.c version.h +nwipe_CFLAGS = $(PARTED_CFLAGS) +nwipe_LDADD = $(PARTED_LIBS)