From 95b5d24f434b6f2174d500a0c7b2bba78b7cd2e9 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 11 Sep 2015 21:30:05 +0200 Subject: [PATCH] configure: relocate configure.h Commit 9403edbb93a2c337df790408e9ff3d26566b7443 move location of configure.h and lvm-version.h. Let's try even better place then /conf dir which should be left for user configurable files. Put these files right into include dir. --- conf/Makefile.in | 3 +-- configure | 12 ++++++------ configure.in | 4 ++-- include/.symlinks.in | 2 -- include/Makefile.in | 4 ++-- {conf => include}/configure.h.in | 2 +- {conf => include}/lvm-version.h.in | 0 7 files changed, 12 insertions(+), 15 deletions(-) rename {conf => include}/configure.h.in (99%) rename {conf => include}/lvm-version.h.in (100%) diff --git a/conf/Makefile.in b/conf/Makefile.in index b3ea85ba7..128395e3f 100644 --- a/conf/Makefile.in +++ b/conf/Makefile.in @@ -54,5 +54,4 @@ install_lvm2: install_conf install_localconf install_profiles install: install_lvm2 -DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES) \ - configure.h lvm-version.h +DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES) diff --git a/configure b/configure index ea448784c..31dc750e1 100755 --- a/configure +++ b/configure @@ -2969,7 +2969,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers conf/configure.h" +ac_config_headers="$ac_config_headers include/configure.h" ################################################################################ @@ -7636,8 +7636,8 @@ done ################################################################################ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable dependency tracking" >&5 -$as_echo_n "checking whether to disable dependency tracking... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dependency tracking" >&5 +$as_echo_n "checking whether to enable dependency tracking... " >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; USE_TRACKING=$enableval @@ -14212,7 +14212,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile conf/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14906,7 +14906,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "conf/configure.h") CONFIG_HEADERS="$CONFIG_HEADERS conf/configure.h" ;; + "include/configure.h") CONFIG_HEADERS="$CONFIG_HEADERS include/configure.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "make.tmpl") CONFIG_FILES="$CONFIG_FILES make.tmpl" ;; "daemons/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/Makefile" ;; @@ -14936,7 +14936,7 @@ do "lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;; "lib/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mirror/Makefile" ;; "lib/replicator/Makefile") CONFIG_FILES="$CONFIG_FILES lib/replicator/Makefile" ;; - "conf/lvm-version.h") CONFIG_FILES="$CONFIG_FILES conf/lvm-version.h" ;; + "include/lvm-version.h") CONFIG_FILES="$CONFIG_FILES include/lvm-version.h" ;; "lib/raid/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raid/Makefile" ;; "lib/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES lib/snapshot/Makefile" ;; "lib/thin/Makefile") CONFIG_FILES="$CONFIG_FILES lib/thin/Makefile" ;; diff --git a/configure.in b/configure.in index 169a50014..c240b4be7 100644 --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ AC_PREREQ(2.61) dnl -- Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) -AC_CONFIG_HEADERS([conf/configure.h]) +AC_CONFIG_HEADERS([include/configure.h]) ################################################################################ dnl -- Setup the directory where autoconf has auxilary files @@ -2086,7 +2086,7 @@ lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile -conf/lvm-version.h +include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile diff --git a/include/.symlinks.in b/include/.symlinks.in index 77f23bcb5..9b97eb42b 100644 --- a/include/.symlinks.in +++ b/include/.symlinks.in @@ -1,5 +1,3 @@ -@top_builddir@/conf/configure.h -@top_builddir@/conf/lvm-version.h @top_srcdir@/daemons/clvmd/clvm.h @top_srcdir@/daemons/dmeventd/libdevmapper-event.h @top_srcdir@/daemons/lvmetad/lvmetad-client.h diff --git a/include/Makefile.in b/include/Makefile.in index 2049b671e..c7f68656f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,6 +1,6 @@ # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved. +# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -35,5 +35,5 @@ device-mapper: all cflow: all -DISTCLEAN_TARGETS += .symlinks +DISTCLEAN_TARGETS += .symlinks configure.h lvm-version.h CLEAN_TARGETS += $(LINKS) .include_symlinks .symlinks_created diff --git a/conf/configure.h.in b/include/configure.h.in similarity index 99% rename from conf/configure.h.in rename to include/configure.h.in index 7d157a9a2..cb7771f52 100644 --- a/conf/configure.h.in +++ b/include/configure.h.in @@ -1,4 +1,4 @@ -/* conf/configure.h.in. Generated from configure.in by autoheader. */ +/* include/configure.h.in. Generated from configure.in by autoheader. */ /* Define to 1 to use libblkid detection of signatures when wiping. */ #undef BLKID_WIPING_SUPPORT diff --git a/conf/lvm-version.h.in b/include/lvm-version.h.in similarity index 100% rename from conf/lvm-version.h.in rename to include/lvm-version.h.in