Ertuğrul Erata
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
--- configure.in~ 2014-05-09 18:12:36.163307302 +0200
|
|
+++ configure.in 2014-05-09 18:14:08.233307001 +0200
|
|
@@ -1040,6 +1040,7 @@
|
|
])
|
|
if test x$BLKID_WIPING = xyes; then
|
|
BLKID_PC="blkid"
|
|
+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
|
|
AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
|
|
fi
|
|
fi
|
|
@@ -1068,6 +1069,7 @@
|
|
pkg_config_init
|
|
fi
|
|
PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
|
|
+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
|
|
AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
|
|
fi
|
|
|
|
@@ -1694,6 +1694,7 @@
|
|
AC_SUBST(ELDFLAGS)
|
|
AC_SUBST(FSADM)
|
|
AC_SUBST(BLKDEACTIVATE)
|
|
+AC_SUBST(BLKID_STATIC_LIBS)
|
|
AC_SUBST(HAVE_LIBDL)
|
|
AC_SUBST(HAVE_REALTIME)
|
|
AC_SUBST(INTL)
|
|
@@ -1750,6 +1751,7 @@
|
|
AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS)
|
|
AC_SUBST(UDEV_RULE_EXEC_DETECTION)
|
|
AC_SUBST(UDEV_HAS_BUILTIN_BLKID)
|
|
+AC_SUBST(UDEV_STATIC_LIBS)
|
|
AC_SUBST(WRITE_INSTALL)
|
|
AC_SUBST(DMEVENTD_PIDFILE)
|
|
AC_SUBST(LVMETAD_PIDFILE)
|
|
--- make.tmpl.in~ 2014-05-09 18:12:40.353307288 +0200
|
|
+++ make.tmpl.in 2014-05-09 18:15:07.866640139 +0200
|
|
@@ -43,7 +43,7 @@
|
|
|
|
LIBS = @LIBS@
|
|
# Extra libraries always linked with static binaries
|
|
-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
|
|
+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
|
|
DEFS += @DEFS@
|
|
# FIXME set this only where it's needed, not globally?
|
|
CFLAGS += @CFLAGS@
|
|
@@ -59,8 +59,10 @@
|
|
SELINUX_LIBS = @SELINUX_LIBS@
|
|
UDEV_CFLAGS = @UDEV_CFLAGS@
|
|
UDEV_LIBS = @UDEV_LIBS@
|
|
+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
|
|
BLKID_CFLAGS = @BLKID_CFLAGS@
|
|
BLKID_LIBS = @BLKID_LIBS@
|
|
+BLKID_STATIC_LIBS=@BLKID_STATIC_LIBS@
|
|
TESTING = @TESTING@
|
|
|
|
# Setup directory variables
|