From e83f71d678549374389d9cbccdd06b7ee63d978b Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Fri, 31 Oct 2008 22:34:42 +0000 Subject: [PATCH] autoreconf --- configure | 26 ++++---------------------- lib/misc/configure.h.in | 14 +++++++++++++- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 6b76e1814..f965257b8 100755 --- a/configure +++ b/configure @@ -701,7 +701,6 @@ CMDLIB COPTIMISE_FLAG DEBUG DEVMAPPER -DMDIR DMEVENTD DM_COMPAT DM_DEVICE_GID @@ -1364,7 +1363,6 @@ Optional Packages: --with-localedir=DIR Translation files in DIR [PREFIX/share/locale] --with-confdir=DIR Configuration files in DIR /etc --with-staticdir=DIR Static binary in DIR EXEC_PREFIX/sbin - --with-dmdir=DIR Build against device-mapper source tree in DIR --with-usrlibdir=DIR --with-usrsbindir=DIR --with-dmeventd-pidfile=PATH dmeventd pidfile [/var/run/dmeventd.pid] @@ -10071,21 +10069,6 @@ fi -# Check whether --with-dmdir was given. -if test "${with_dmdir+set}" = set; then - withval=$with_dmdir; DMDIR="$withval" CPPFLAGS="$CPPFLAGS -I$DMDIR/include" -else - DMDIR= -fi - - -# Convert a relative dir name to absolute. -case $DMDIR in - /*) ;; - *) DMDIR="`pwd`/$DMDIR" ;; -esac - - # Check whether --with-usrlibdir was given. if test "${with_usrlibdir+set}" = set; then withval=$with_usrlibdir; usrlibdir="$withval" @@ -11837,11 +11820,10 @@ LVM_VERSION="\"`cat VERSION 2>/dev/null || echo Unknown`\"" - ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/Makefile test/Makefile tools/Makefile tools/version.h" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/Makefile test/Makefile tools/Makefile tools/version.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12404,6 +12386,7 @@ do "daemons/clvmd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/clvmd/Makefile" ;; "daemons/dmeventd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/Makefile" ;; "daemons/dmeventd/libdevmapper-event.pc") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/libdevmapper-event.pc" ;; + "daemons/dmeventd/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/Makefile" ;; "daemons/dmeventd/plugins/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/mirror/Makefile" ;; "daemons/dmeventd/plugins/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/snapshot/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -12570,7 +12553,6 @@ CMDLIB!$CMDLIB$ac_delim COPTIMISE_FLAG!$COPTIMISE_FLAG$ac_delim DEBUG!$DEBUG$ac_delim DEVMAPPER!$DEVMAPPER$ac_delim -DMDIR!$DMDIR$ac_delim DMEVENTD!$DMEVENTD$ac_delim DM_COMPAT!$DM_COMPAT$ac_delim DM_DEVICE_GID!$DM_DEVICE_GID$ac_delim @@ -12580,6 +12562,7 @@ DM_IOCTLS!$DM_IOCTLS$ac_delim DM_LIB_VERSION!$DM_LIB_VERSION$ac_delim FSADM!$FSADM$ac_delim GROUP!$GROUP$ac_delim +HAVE_LIBDL!$HAVE_LIBDL$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -12621,7 +12604,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -HAVE_LIBDL!$HAVE_LIBDL$ac_delim HAVE_REALTIME!$HAVE_REALTIME$ac_delim HAVE_SELINUX!$HAVE_SELINUX$ac_delim INTL!$INTL$ac_delim @@ -12652,7 +12634,7 @@ usrsbindir!$usrsbindir$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in index dd58220f0..c59803137 100644 --- a/lib/misc/configure.h.in +++ b/lib/misc/configure.h.in @@ -14,12 +14,18 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* Define to 1 to enable device-mapper interaction. */ +/* Define to 1 to enable LVM2 device-mapper interaction. */ #undef DEVMAPPER_SUPPORT /* Define to 1 to enable the device-mapper event daemon. */ #undef DMEVENTD +/* Path to dmeventd binary. */ +#undef DMEVENTD_PATH + +/* Path to dmeventd pidfile. */ +#undef DMEVENTD_PIDFILE + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -33,6 +39,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H +/* Define to 1 if canonicalize_file_name is available. */ +#undef HAVE_CANONICALIZE_FILE_NAME + /* Define to 1 if you have the header file. */ #undef HAVE_CTYPE_H @@ -60,6 +69,9 @@ /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME +/* Define to 1 if getline is available. */ +#undef HAVE_GETLINE + /* Define to 1 if you have the `getmntent' function. */ #undef HAVE_GETMNTENT