gfs2-utils: master - build: drop dependency on libvolume_id

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=81519bd940faacba7b976ac46bfa3545b4f9b28b
Commit:        81519bd940faacba7b976ac46bfa3545b4f9b28b
Parent:        8b6731a22d452d76585bac655f7878b51ba38054
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Jun 11 11:05:33 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Jun 11 11:05:33 2009 +0200

build: drop dependency on libvolume_id

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure             |   14 --------------
 gfs2/mkfs/Makefile    |    2 --
 make/defines.mk.input |    2 --
 3 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index b400892..991f02e 100755
--- a/configure
+++ b/configure
@@ -42,8 +42,6 @@ my %options = (
 	fencedlibdir => \$fencedlibdir,
 	logtincdir => \$logtincdir,
 	logtlibdir => \$logtlibdir,
-	volidincdir => \$volidincdir,
-	volidlibdir => \$volidlibdir,
 	ncursesincdir => \$ncursesincdir,
 	ncurseslibdir => \$ncurseslibdir,
 	corosyncincdir => \$corosyncincdir,
@@ -93,8 +91,6 @@ my $err = &GetOptions (\%options,
 		    'fencedlibdir=s',
 		    'logtincdir=s',
 		    'logtlibdir=s',
-		    'volidincdir=s',
-		    'volidlibdir=s',
 		    'ncursesincdir=s',
 		    'ncurseslibdir=s',
 		    'corosyncincdir=s',
@@ -162,8 +158,6 @@ if ($help || !$err) {
   print "--fencedlibdir=\tthe base directory for fenced libraries.  (Default: {libdir})\n";
   print "--logtincdir=\tthe base directory for logthread include files.  (Default: {incdir})\n";
   print "--logtlibdir=\tthe base directory for logthread libraries.  (Default: {libdir})\n";
-  print "--volidincdir=\tthe base directory for volume_id include files.  (Default: {incdir})\n";
-  print "--volidlibdir=\tthe base directory for volume_id libraries.  (Default: {libdir})\n";
   print "--ncursesincdir=\tthe base directory for ncurses include files.  (Default: {incdir})\n";
   print "--ncurseslibdir=\tthe base directory for ncurses libraries.  (Default: {libdir})\n";
   print "--corosyncincdir=\tthe base directory for corosync include files.  (Default: {incdir})\n";
@@ -350,12 +344,6 @@ if (!$logtincdir) {
 if (!$logtlibdir) {
   $logtlibdir="${libdir}";
 }
-if (!$volidincdir) {
-  $volidincdir="${incdir}";
-}
-if (!$volidlibdir) {
-  $volidlibdir="${libdir}";
-}
 if (!$ncursesincdir) {
   $ncursesincdir="${incdir}";
 }
@@ -465,8 +453,6 @@ while (<IFILE>) {
   $_ =~ s/\@FENCEDLIBDIR\@/$fencedlibdir/;
   $_ =~ s/\@LOGTINCDIR\@/$logtincdir/;
   $_ =~ s/\@LOGTLIBDIR\@/$logtlibdir/;
-  $_ =~ s/\@VOLIDINCDIR\@/$volidincdir/;
-  $_ =~ s/\@VOLIDLIBDIR\@/$volidlibdir/;
   $_ =~ s/\@NCURSESINCDIR\@/$ncursesincdir/;
   $_ =~ s/\@NCURSESLIBDIR\@/$ncurseslibdir/;
   $_ =~ s/\@COROSYNCINCDIR\@/$corosyncincdir/;
diff --git a/gfs2/mkfs/Makefile b/gfs2/mkfs/Makefile
index 80d9d3f..7a67898 100644
--- a/gfs2/mkfs/Makefile
+++ b/gfs2/mkfs/Makefile
@@ -21,11 +21,9 @@ OBJS=	main.o \
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
 CFLAGS += -I${KERNEL_SRC}/include/
-CFLAGS += -I${volidincdir}
 CFLAGS += -I$(S)/../include -I$(S)/../libgfs2
 CFLAGS += -I${incdir}
 
-LDFLAGS += -L${volidlibdir} -lvolume_id
 LDFLAGS += -L../libgfs2 -lgfs2
 LDFLAGS += -L${libdir}
 
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 8b2f5e7..5f65f5c 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -34,8 +34,6 @@ fencedincdir ?= @FENCEDINCDIR@
 fencedlibdir ?= @FENCEDLIBDIR@
 logtincdir ?= @LOGTINCDIR@
 logtlibdir ?= @LOGTLIBDIR@
-volidincdir ?= @VOLIDINCDIR@
-volidlibdir ?= @VOLIDLIBDIR@
 ncursesincdir ?= @NCURSESINCDIR@
 ncurseslibdir ?= @NCURSESLIBDIR@
 corosyncincdir ?= @COROSYNCINCDIR@