update configure for cmdlib

configure.in

@@ -1,4 +1,3 @@
-################################################################################
 ##
 ##    Copyright 1999-2000 Sistina Software, Inc.
 ##
@@ -51,7 +50,23 @@ AC_CANONICAL_SYSTEM
 
 case "$host_os" in
 	linux*)
-		CFLAGS= ;;
+		CFLAGS= 
+		CLDFLAGS="-Wl,--version-script,.export.sym"
+		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+		LD_DEPS=".export.sym"
+		SOFLAG="-shared"
+		DEVMAPPER=yes
+		ODIRECT=yes ;;
+	darwin*)
+		CFLAGS="-no-cpp-precomp -fno-common"
+		CLDFLAGS=
+		CLDWHOLEARCHIVE="-all_load"
+		CLDNOWHOLEARCHIVE=
+		LD_DEPS=
+		SOFLAG="-dynamiclib"
+		DEVMAPPER=no
+		ODIRECT=no ;;
 esac
 
 dnl -- prefix is /usr by default, the exec_prefix default is setup later
@@ -89,8 +104,8 @@ fi
 
 AC_ARG_ENABLE(jobs, [  --enable-jobs=NUM       Number of jobs to run simultaneously], JOBS=-j$enableval, JOBS=-j2)
 
-dnl Enables staticly linked tools
+dnl Enables staticly-linked tools
-AC_ARG_ENABLE(static_link, [  --enable-static_link    Use this to link the tools to the liblvm library
+AC_ARG_ENABLE(static_link, [  --enable-static_link    Use this to link the tools to their libraries
                           statically.  Default is dynamic linking],  STATIC_LINK=$enableval, STATIC_LINK=no)
 
 dnl Enable readline
@@ -110,7 +125,7 @@ echo "$ac_t""$DEBUG" 1>&6
 echo $ac_n "checking whether to enable device-mapper""... $ac_c" 1>&6
 dnl Disable devmapper
 AC_ARG_ENABLE(devmapper, [  --disable-devmapper     Disable device-mapper interaction],  \
-DEVMAPPER=no, DEVMAPPER=yes)
+DEVMAPPER=no)
 echo "$ac_t""$DEVMAPPER" 1>&6
 
 if test x$DEVMAPPER = xyes; then
@@ -120,13 +135,23 @@ fi
 echo $ac_n "checking whether to enable O_DIRECT""... $ac_c" 1>&6
 dnl Disable O_DIRECT
 AC_ARG_ENABLE(o_direct, [  --disable-o_direct      Disable O_DIRECT],  \
-ODIRECT=no, ODIRECT=yes)
+ODIRECT=no)
 echo "$ac_t""$ODIRECT" 1>&6
 
 if test x$ODIRECT = xyes; then
 	CFLAGS="$CFLAGS -DO_DIRECT_SUPPORT"
 fi
 
+echo $ac_n "checking whether to compile liblvm2cmd.so""... $ac_c" 1>&6
+dnl Enable cmdlib
+AC_ARG_ENABLE(cmdlib, [  --enable-cmdlib         Build shared command library],  \
+CMDLIB=yes, CMDLIB=no)
+echo "$ac_t""$CMDLIB" 1>&6
+
+if test x$CMDLIB = xyes; then
+	CFLAGS="$CFLAGS -DCMDLIB"
+fi
+
 dnl Mess with default exec_prefix
 if [[ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ]];
  then  exec_prefix="";
@@ -217,15 +242,22 @@ AC_SUBST(LVM1)
 AC_SUBST(OWNER)
 AC_SUBST(GROUP)
 AC_SUBST(CFLAGS)
+AC_SUBST(CLDFLAGS)
+AC_SUBST(CLDWHOLEARCHIVE)
+AC_SUBST(CLDNOWHOLEARCHIVE)
+AC_SUBST(LD_DEPS)
+AC_SUBST(SOFLAG)
 AC_SUBST(LIBS)
 AC_SUBST(LVM_VERSION)
 AC_SUBST(DEBUG)
 AC_SUBST(DEVMAPPER)
 AC_SUBST(HAVE_LIBDL)
+AC_SUBST(CMDLIB)
 AC_SUBST(MSGFMT)
 AC_SUBST(LOCALEDIR)
 AC_SUBST(INTL_PACKAGE)
 AC_SUBST(INTL)
+
 dnl First and last lines should not contain files to generate in order to 
 dnl keep utility scripts running properly
 AC_OUTPUT( 								\

tools/archive.h

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2001 Sistina Software (UK) Limited.
- *
- * This file is released under the GPL.
- */
-
-#ifndef _LVM_TOOL_ARCHIVE_H
-#define _LVM_TOOL_ARCHIVE_H
-
-#include "metadata.h"
-
-/*
- * FIXME: This file is going to merge with the archiving code in
- * lib/format_text at some point.
- */
-
-/*
- * There are two operations that come under the general area of
- * backups.  'Archiving' occurs just before a volume group
- * configuration is changed.  The user may configure when
- * archived files are expired.  Typically archives will be stored
- * in /etc/lvm/archive.
- *
- * A 'backup' is a redundant copy of the *current* volume group
- * configuration.  As such it should be taken just after the
- * volume group is changed.  Only 1 backup file will exist.
- * Typically backups will be stored in /etc/lvm/backups.
- */
-
-int archive_init(const char *dir,
-		 unsigned int keep_days, unsigned int keep_min);
-void archive_exit(void);
-
-void archive_enable(int flag);
-int archive(struct volume_group *vg);
-int archive_display(struct cmd_context *cmd, const char *vg_name);
-
-int backup_init(const char *dir);
-void backup_exit(void);
-
-void backup_enable(int flag);
-int backup(struct volume_group *vg);
-int backup_remove(const char *vg_name);
-
-struct volume_group *backup_read_vg(struct cmd_context *cmd,
-				    const char *vg_name, const char *file);
-int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg);
-int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
-			     const char *file);
-int backup_restore(struct cmd_context *cmd, const char *vg_name);
-
-int backup_to_file(const char *file, const char *desc, struct volume_group *vg);
-
-#endif