From 9cd1b3550804cac72c32ef081a30870b45b90d3c Mon Sep 17 00:00:00 2001 From: yoe Date: Thu, 15 May 2008 19:27:34 +0000 Subject: [PATCH] r336: Cut out klcc usage. It's broken, silly to even try. --- Makefile.am | 5 ----- configure.ac | 39 --------------------------------------- 2 files changed, 44 deletions(-) diff --git a/Makefile.am b/Makefile.am index f2c61aa..d9fad16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,8 +24,3 @@ nbd-server.5.in: nbd-server.5.sgml mv NBD-SERVER.5 nbd-server.5.in dist-hook: rm -Rf `find $(distdir) -name '.svn' -type d -print` -knbd_client-nbd-client.o: nbd-client.c - $(KLCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(knbd_client_CPPFLAGS) $(CPPFLAGS) $(knbd_client_CFLAGS) $(CFLAGS) -c -o knbd_client-nbd-client.o nbd-client.c -knbd-client$(EXEEXT): knbd_client-nbd-client.o $(knbd_client_DEPENDENCIES) - @rm -f knbd-client$(EXEEXT) - $(LINK) $(knbd_client_LDFLAGS) knbd_client-nbd-client.o $(knbd_client_LDADD) $(LIBS) diff --git a/configure.ac b/configure.ac index 2a92009..3e5663a 100644 --- a/configure.ac +++ b/configure.ac @@ -82,45 +82,6 @@ AC_ARG_ENABLE( ] ) -AC_MSG_CHECKING(for klcc) -AC_ARG_WITH( - klcc, - AC_HELP_STRING(--with-klcc,[Build a version of nbd-client against klibc (for initramfs uses). Specify the path to 'klcc' (default autodetected)]), - [ - if test "x$withval" != "x"; then - if test -x "$withval"; then - KLCC="$withval" - sbin_PROGRAMS=knbd-client - AC_MSG_RESULT($KLCC) - else - if test "$withval" = "no"; then - KLCC="" - AC_MSG_RESULT(Disabled) - else - AC_MSG_ERROR([specified klcc ($withval) is not executable or does not exist.]) - fi - fi - else - if test -x /usr/bin/klcc; then - KLCC=/usr/bin/klcc - sbin_PROGRAMS=knbd-client - AC_MSG_RESULT($KLCC) - else - AC_MSG_ERROR([klcc not found! Please specify it as a parameter to the --with-klcc option]); - fi - fi - ], - [ if test -x /usr/bin/klcc; then - sbin_PROGRAMS=knbd-client - KLCC=/usr/bin/klcc - AC_MSG_RESULT($KLCC) - else - AC_MSG_RESULT(not found) - fi - ] -) -AC_SUBST(KLCC) - AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL -- 1.7.10.4