cluster: STABLE3 - build: drop dependency on libvolume_id

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=779dd3c23ca6c56f5b3f7a8a7831bae775c85201
Commit:        779dd3c23ca6c56f5b3f7a8a7831bae775c85201
Parent:        7f44adffa6b09e940e2e6c37764101ef6c7c28d3
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Jun 11 11:02:55 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Jun 11 11:02:55 2009 +0200

build: drop dependency on libvolume_id

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

diff --git a/configure b/configure
index 1daa4a7..cf9d730 100755
--- a/configure
+++ b/configure
@@ -47,8 +47,6 @@ my %options = (
 	fencelibdir => \$fencelibdir,
 	logtincdir => \$logtincdir,
 	logtlibdir => \$logtlibdir,
-	volidincdir => \$volidincdir,
-	volidlibdir => \$volidlibdir,
 	ncursesincdir => \$ncursesincdir,
 	ncurseslibdir => \$ncurseslibdir,
 	slangincdir => \$slangincdir,
@@ -138,8 +136,6 @@ my $err = &GetOptions (\%options,
 		    'fencelibdir=s',
 		    'logtincdir=s',
 		    'logtlibdir=s',
-		    'volidincdir=s',
-		    'volidlibdir=s',
 		    'ncursesincdir=s',
 		    'ncurseslibdir=s',
 		    'slangincdir=s',
@@ -252,8 +248,6 @@ if ($help || !$err) {
   print "--fencelibdir=\tthe base directory for fence libraries.  (Default: ./fence/libfence)\n";
   print "--logtincdir=\tthe base directory for logthread include files.  (Default: ./common/liblogthread)\n";
   print "--logtlibdir=\tthe base directory for logthread libraries.  (Default: ./common/liblogthread)\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 "--slangincdir=\tthe base directory for S-Lang include files.  (Default: {incdir})\n";
@@ -493,12 +487,6 @@ if (!$logtincdir) {
 if (!$logtlibdir) {
   $logtlibdir="${objdir}/common/liblogthread";
 }
-if (!$volidincdir) {
-  $volidincdir="${incdir}";
-}
-if (!$volidlibdir) {
-  $volidlibdir="${libdir}";
-}
 if (!$readlineincdir) {
   $readlineincdir="${incdir}";
 }
@@ -752,8 +740,6 @@ while (<IFILE>) {
   $_ =~ s/\@FENCELIBDIR\@/$fencelibdir/;
   $_ =~ s/\@LOGTINCDIR\@/$logtincdir/;
   $_ =~ s/\@LOGTLIBDIR\@/$logtlibdir/;
-  $_ =~ s/\@VOLIDINCDIR\@/$volidincdir/;
-  $_ =~ s/\@VOLIDLIBDIR\@/$volidlibdir/;
   $_ =~ s/\@READLINEINCDIR\@/$readlineincdir/;
   $_ =~ s/\@READLINELIBDIR\@/$readlinelibdir/;
   $_ =~ s/\@NCURSESINCDIR\@/$ncursesincdir/;
diff --git a/gfs/gfs_mkfs/Makefile b/gfs/gfs_mkfs/Makefile
index 165644b..91e2c77 100644
--- a/gfs/gfs_mkfs/Makefile
+++ b/gfs/gfs_mkfs/Makefile
@@ -18,11 +18,10 @@ OBJS=	device_geometry.o \
 	structures.o
 
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${gfskincdir} -I${volidincdir}
+CFLAGS += -I${gfskincdir}
 CFLAGS += -I$(S)/../include -I$(S)/../libgfs
 CFLAGS += -I${incdir}
 
-LDFLAGS += -L${volidlibdir} -lvolume_id
 LDFLAGS += -L../libgfs -lgfs
 LDFLAGS += -L${libdir}
 
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 bfc0fc0..66184e3 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -47,8 +47,6 @@ fenceincdir ?= @FENCEINCDIR@
 fencelibdir ?= @FENCELIBDIR@
 logtincdir ?= @LOGTINCDIR@
 logtlibdir ?= @LOGTLIBDIR@
-volidincdir ?= @VOLIDINCDIR@
-volidlibdir ?= @VOLIDLIBDIR@
 readlineincdir ?= @READLINEINCDIR@
 readlinelibdir ?= @READLINELIBDIR@
 ncursesincdir ?= @NCURSESINCDIR@