diff options
268 files changed, 1969 insertions, 790 deletions
@@ -48,12 +48,9 @@ datadir = @datadir@ CC = @CC@ BUILD_CC = @BUILD_CC@ -DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@ CFLAGS = @CFLAGS@ -CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@ -INTL_FLAGS = @INTL_FLAGS@ -ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \ - $(INTL_FLAGS) $(LINUX_INCLUDE) +CPPFLAGS = @INCLUDES@ +ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) LDFLAGS = @LDFLAGS@ ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@ LDFLAGS_STATIC = $(LDFLAGS) @LDFLAG_STATIC@ @@ -127,10 +124,6 @@ DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@ DEPPROFILED_LIBQUOTA = @PROFILED_LIBQUOTA@ DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(DEPPROFILED_LIBUUID) -# An include directive pointing to a directory holding enough linux-like -# include files to satisfy some programs here -LINUX_INCLUDE=@LINUX_INCLUDE@ - # # A fast substitution command for fixing up man pages, shell scripts, etc. # @@ -159,7 +152,7 @@ WFLAGS= -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \ -UENABLE_NLS gcc-wall-new: - (make USE_WFLAGS="$(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup + (make CFLAGS="@CFLAGS@ $(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup gcc-wall: make clean > /dev/null @@ -197,6 +190,14 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(top_builddir)/MCONFIG: $(top_srcdir)/MCONFIG.in $(top_builddir)/config.status cd $(top_builddir); CONFIG_FILES=MCONFIG ./config.status +$(top_builddir)/lib/config.h: $(top_srcdir)/lib/config.h.in \ + $(top_builddir)/config.status + cd $(top_builddir); CONFIG_FILES=lib/config.h ./config.status + +$(top_builddir)/lib/dirpaths.h: $(DEP_SUBSTITUTE) $(top_srcdir)/lib/dirpaths.h.in + $(E) " SUBST $@" + $(Q) $(SUBSTITUTE) $(top_srcdir)/lib/dirpaths.h.in $@ + $(top_builddir)/lib/substitute_sh: $(top_srcdir)/lib/substitute_sh.in \ $(top_builddir)/config.status cd $(top_builddir); CONFIG_FILES=lib/substitute_sh ./config.status @@ -210,7 +211,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \ cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status @MAINTAINER_CMT@$(top_srcdir)/configure: $(top_srcdir)/configure.in -@MAINTAINER_CMT@ cd $(top_srcdir) && autoconf +@MAINTAINER_CMT@ cd $(top_srcdir) && autoheader && autoconf # # Make depend magic... diff --git a/Makefile.in b/Makefile.in index a61c5c24..7c5d441a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,7 +19,8 @@ LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBD PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests -SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h +SUBS= util/subst.conf lib/config.h lib/dirpaths.h \ + lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h TAR=tar @@ -596,7 +596,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS BUILD_LDFLAGS BUILD_CFLAGS -INTL_FLAGS +INCLUDES DO_TEST_SUITE ET_DIR SS_DIR @@ -654,6 +654,8 @@ HAVE_ASPRINTF HAVE_POSIX_PRINTF GLIBC21 ALLOCA +EGREP +GREP RANLIB MSGMERGE XGETTEXT @@ -715,9 +717,6 @@ E LINK_BUILD_FLAGS LINK_INSTALL_FLAGS MAINTAINER_CMT -LINUX_INCLUDE -EGREP -GREP CPP RDYNAMIC DLOPEN_LIB @@ -1701,93 +1700,6 @@ fi } # ac_fn_c_try_cpp -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_header_mongrel - # ac_fn_c_try_run LINENO # ---------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -1830,37 +1742,6 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache @@ -1915,6 +1796,37 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -1982,6 +1894,93 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2633,6 +2632,9 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +ac_config_headers="$ac_config_headers lib/config.h" + + MCONFIG=./MCONFIG BINARY_TYPE=bin @@ -3595,6 +3597,7 @@ fi $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : DLOPEN_LIB=-ldl + $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h fi @@ -4308,279 +4311,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -ac_fn_c_check_header_mongrel "$LINENO" "linux/fs.h" "ac_cv_header_linux_fs_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_fs_h" = x""yes; then : - linux_headers=yes -else - linux_headers=no -fi - - -if test "$linux_headers" != yes; then - LINUX_INCLUDE='-I$(top_builddir)/include' -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional special compiler flags" >&5 $as_echo_n "checking for additional special compiler flags... " >&6; } if test "$GCC" = yes @@ -4703,7 +4433,8 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support" >&5 $as_echo "Disabling compression support" >&6; } else - $as_echo "#define ENABLE_COMPRESSION 1" >>confdefs.h + +$as_echo "#define ENABLE_COMPRESSION 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling compression support" >&5 $as_echo "Enabling compression support" >&6; } @@ -4717,6 +4448,7 @@ $as_echo "Disabling compression support by default" >&6; } fi + # Check whether --enable-htree was given. if test "${enable_htree+set}" = set; then : enableval=$enable_htree; if test "$enableval" = "no" @@ -4876,7 +4608,8 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling journal debugging" >&5 $as_echo "Disabling journal debugging" >&6; } else - $as_echo "#define CONFIG_JBD_DEBUG 1" >>confdefs.h + +$as_echo "#define CONFIG_JBD_DEBUG 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling journal debugging" >&5 $as_echo "Enabling journal debugging" >&6; } @@ -4895,7 +4628,8 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling blkid debugging" >&5 $as_echo "Disabling blkid debugging" >&6; } else - $as_echo "#define CONFIG_BLKID_DEBUG 1" >>confdefs.h + +$as_echo "#define CONFIG_BLKID_DEBUG 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling blkid debugging" >&5 $as_echo "Enabling blkid debugging" >&6; } @@ -4909,7 +4643,8 @@ fi # Check whether --enable-testio-debug was given. if test "${enable_testio_debug+set}" = set; then : - enableval=$enable_testio_debug; if test "$enableval" = "no" + enableval=$enable_testio_debug; +if test "$enableval" = "no" then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling testio debugging" >&5 $as_echo "Disabling testio debugging" >&6; } @@ -5262,6 +4997,7 @@ DEPSTATIC_LIBBLKID= PROFILED_LIBBLKID= DEPPROFILED_LIBBLKID= BLKID_CMT= + # Check whether --enable-libblkid was given. if test "${enable_libblkid+set}" = set; then : enableval=$enable_libblkid; if test "$enableval" = "no" @@ -5781,6 +5517,7 @@ _ACEOF $as_echo "$ac_cv_tls" >&6; } fi + # Check whether --enable-uuidd was given. if test "${enable_uuidd+set}" = set; then : enableval=$enable_uuidd; if test "$enableval" = "no" @@ -5812,10 +5549,12 @@ GETTEXT_PACKAGE=e2fsprogs PACKAGE=e2fsprogs VERSION="$E2FSPROGS_VERSION" VERSION=0.14.1 + cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF + cat >>confdefs.h <<_ACEOF #define VERSION "$VERSION" _ACEOF @@ -6391,6 +6130,249 @@ fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <float.h> + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <string.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdlib.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ctype.h> +#include <stdlib.h> +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } if test "${ac_cv_c_const+set}" = set; then : @@ -6545,6 +6527,24 @@ _ACEOF ;; esac +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" if test "x$ac_cv_type_off_t" = x""yes; then : @@ -10389,21 +10389,24 @@ done ac_fn_c_check_member "$LINENO" "struct dirent" "d_reclen" "ac_cv_member_struct_dirent_d_reclen" "#include <dirent.h> " if test "x$ac_cv_member_struct_dirent_d_reclen" = x""yes; then : - $as_echo "#define HAVE_RECLEN_DIRENT 1" >>confdefs.h + +$as_echo "#define HAVE_RECLEN_DIRENT 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "#include <sys/types.h> " if test "x$ac_cv_type_ssize_t" = x""yes; then : - $as_echo "#define HAVE_TYPE_SSIZE_T 1" >>confdefs.h + +$as_echo "#define HAVE_TYPE_SSIZE_T 1" >>confdefs.h fi ac_fn_c_check_decl "$LINENO" "llseek" "ac_cv_have_decl_llseek" "#include <unistd.h> " if test "x$ac_cv_have_decl_llseek" = x""yes; then : - $as_echo "#define HAVE_LLSEEK_PROTOTYPE 1" >>confdefs.h + +$as_echo "#define HAVE_LLSEEK_PROTOTYPE 1" >>confdefs.h fi @@ -10412,7 +10415,8 @@ ac_fn_c_check_decl "$LINENO" "lseek64" "ac_cv_have_decl_lseek64" "#define _LARGE #include <unistd.h> " if test "x$ac_cv_have_decl_lseek64" = x""yes; then : - $as_echo "#define HAVE_LSEEK64_PROTOTYPE 1" >>confdefs.h + +$as_echo "#define HAVE_LSEEK64_PROTOTYPE 1" >>confdefs.h fi @@ -10878,7 +10882,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $e2fsprogs_cv_struct_st_flags_immut" >&5 $as_echo "$e2fsprogs_cv_struct_st_flags_immut" >&6; } if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then - $as_echo "#define HAVE_STAT_FLAGS 1" >>confdefs.h + +$as_echo "#define HAVE_STAT_FLAGS 1" >>confdefs.h fi fi @@ -11028,9 +11033,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_optreset" >&5 $as_echo "$ac_cv_have_optreset" >&6; } if test $ac_cv_have_optreset = yes; then - $as_echo "#define HAVE_OPTRESET 1" >>confdefs.h + +$as_echo "#define HAVE_OPTRESET 1" >>confdefs.h fi + SEM_INIT_LIB='' ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init" if test "x$ac_cv_func_sem_init" = x""yes; then : @@ -11178,7 +11185,8 @@ $as_echo "$UNI_DIFF_OPTS" >&6; } case "$host_os" in linux*) - $as_echo "#define HAVE_EXT2_IOCTLS 1" >>confdefs.h + +$as_echo "#define HAVE_EXT2_IOCTLS 1" >>confdefs.h ;; esac @@ -11304,7 +11312,8 @@ case "$host_os" in darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Apple Darwin / GNU libintl workaround" >&5 $as_echo "Using Apple Darwin / GNU libintl workaround" >&6; } - $as_echo "#define _INTL_REDIRECT_MACROS 1" >>confdefs.h + +$as_echo "#define _INTL_REDIRECT_MACROS 1" >>confdefs.h ;; esac @@ -11318,9 +11327,12 @@ else DO_TEST_SUITE=check fi -INTL_FLAGS= +INCLUDES='-I. -I$(top_builddir)/lib -I$(top_srcdir)/lib' +if test -n "$CPPFLAGS" ; then + INCLUDES="$INCLUDES $CPPFLAGS" +fi if test "$USE_INCLUDED_LIBINTL" = "yes" ; then - INTL_FLAGS='-I$(top_builddir)/intl -I$(top_srcdir)/intl' + INCLUDES=$INCLUDES' -I$(top_builddir)/intl -I$(top_srcdir)/intl' fi if test $cross_compiling = no; then @@ -11433,43 +11445,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - +DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= @@ -11914,11 +11890,15 @@ case $ac_config_files in *" "*) set x $ac_config_files; shift; ac_config_files=$*;; esac +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" +config_headers="$ac_config_headers" config_commands="$ac_config_commands" _ACEOF @@ -11940,10 +11920,15 @@ Usage: $0 [OPTION]... [TAG]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Configuration commands: $config_commands @@ -12003,7 +11988,18 @@ do esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -12070,6 +12066,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in + "lib/config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/config.h" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "$outlist") CONFIG_FILES="$CONFIG_FILES $outlist" ;; @@ -12084,6 +12081,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -12296,8 +12294,116 @@ fi cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h | sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -12514,7 +12620,30 @@ which seems to be undefined. Please make sure it is defined." >&2;} esac \ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; - + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 + fi + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} diff --git a/configure.in b/configure.in index 8dc75a9b..e8e41fb2 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,8 @@ AC_INIT(version.h) AC_PREREQ(2.50) AC_CONFIG_AUX_DIR(config) +AC_CONFIG_HEADERS([lib/config.h]) +AH_BOTTOM([#include "dirpaths.h"]) MCONFIG=./MCONFIG AC_SUBST_FILE(MCONFIG) BINARY_TYPE=bin @@ -68,7 +70,7 @@ dnl DLOPEN_LIB='' AC_CHECK_LIB(dl, dlopen, [DLOPEN_LIB=-ldl -AC_DEFINE(HAVE_DLOPEN)]) +AC_DEFINE(HAVE_DLOPEN, 1, [Define to 1 if dlopen/libdl exists])]) AC_SUBST(DLOPEN_LIB) dnl dnl Use diet libc @@ -99,16 +101,6 @@ if test "$GCC" = yes; then fi AC_PROG_CPP dnl -dnl On systems without linux header files, we add an extra include directory -dnl that holds enough to fake it (hopefully). Note that the $(top_srcdir) here -dnl is quoted so that it gets expanded by make, not by configure. -dnl -AC_CHECK_HEADER(linux/fs.h, [linux_headers=yes], [linux_headers=no]) -if test "$linux_headers" != yes; then - LINUX_INCLUDE='-I$(top_builddir)/include' -fi -AC_SUBST(LINUX_INCLUDE) -dnl dnl Alpha computers use fast and imprecise floating point code that may dnl miss exceptions by default. Force sane options if we're using GCC. AC_MSG_CHECKING(for additional special compiler flags) @@ -224,7 +216,8 @@ if test "$enableval" = "no" then AC_MSG_RESULT([Disabling compression support]) else - AC_DEFINE(ENABLE_COMPRESSION) + AC_DEFINE(ENABLE_COMPRESSION, 1, + [Define to 1 if ext2 compression enabled]) AC_MSG_RESULT([Enabling compression support]) AC_MSG_WARN([Compression support is experimental]) fi @@ -234,6 +227,7 @@ AC_MSG_RESULT([Disabling compression support by default]) dnl dnl handle --enable-htree dnl +AH_TEMPLATE([ENABLE_HTREE], [Define to 1 if ext3/4 htree support enabled]) AC_ARG_ENABLE([htree], [ --enable-htree enable EXPERIMENTAL htree directory support], if test "$enableval" = "no" @@ -242,12 +236,12 @@ then AC_MSG_RESULT([Disabling htree directory support]) else HTREE_CMT= - AC_DEFINE(ENABLE_HTREE) + AC_DEFINE(ENABLE_HTREE, 1) AC_MSG_RESULT([Enabling htree directory support]) fi , HTREE_CMT= -AC_DEFINE(ENABLE_HTREE) +AC_DEFINE(ENABLE_HTREE, 1) AC_MSG_RESULT([Enabling htree directory support by default]) ) AC_SUBST(HTREE_CMT) @@ -381,7 +375,8 @@ if test "$enableval" = "no" then AC_MSG_RESULT([Disabling journal debugging]) else - AC_DEFINE(CONFIG_JBD_DEBUG) + AC_DEFINE(CONFIG_JBD_DEBUG, 1, + [Define to 1 if debugging ext3/4 journal code]) AC_MSG_RESULT([Enabling journal debugging]) fi , @@ -396,7 +391,8 @@ if test "$enableval" = "no" then AC_MSG_RESULT([Disabling blkid debugging]) else - AC_DEFINE(CONFIG_BLKID_DEBUG) + AC_DEFINE(CONFIG_BLKID_DEBUG, 1, + [Define to 1 if debugging the blkid library]) AC_MSG_RESULT([Enabling blkid debugging]) fi , @@ -407,18 +403,20 @@ dnl handle --enable-testio-debug dnl AC_ARG_ENABLE([testio-debug], [ --disable-testio-debug disable the use of the test I/O manager for debugging], +AH_TEMPLATE([CONFIG_TESTIO_DEBUG], + [Define to 1 if the testio I/O manager should be enabled]) if test "$enableval" = "no" then AC_MSG_RESULT([Disabling testio debugging]) TEST_IO_CMT="#" else TEST_IO_CMT= - AC_DEFINE(CONFIG_TESTIO_DEBUG) + AC_DEFINE(CONFIG_TESTIO_DEBUG, 1) AC_MSG_RESULT([Enabling testio debugging]) fi , AC_MSG_RESULT([Enabling testio debugging by default]) -AC_DEFINE(CONFIG_TESTIO_DEBUG) +AC_DEFINE(CONFIG_TESTIO_DEBUG, 1) TEST_IO_CMT= ) AC_SUBST(TEST_IO_CMT) @@ -484,6 +482,7 @@ DEPSTATIC_LIBBLKID= PROFILED_LIBBLKID= DEPPROFILED_LIBBLKID= BLKID_CMT= +AH_TEMPLATE([CONFIG_BUILD_FINDFS], [Define to 1 to compile findfs]) AC_ARG_ENABLE([libblkid], [ --disable-libblkid do not build private blkid library], if test "$enableval" = "no" @@ -506,7 +505,7 @@ else DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID - AC_DEFINE(CONFIG_BUILD_FINDFS) + AC_DEFINE(CONFIG_BUILD_FINDFS, 1) AC_MSG_RESULT([Enabling private blkid library]) fi , @@ -516,7 +515,7 @@ STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID -AC_DEFINE(CONFIG_BUILD_FINDFS) +AC_DEFINE(CONFIG_BUILD_FINDFS, 1) AC_MSG_RESULT([Enabling private blkid library by default]) ) AC_SUBST(LIBBLKID) @@ -724,6 +723,7 @@ fi dnl dnl dnl +AH_TEMPLATE([USE_UUIDD], [Define to 1 to build uuidd]) AC_ARG_ENABLE([uuidd], [ --disable-uuidd disable building the uuid daemon], [if test "$enableval" = "no" @@ -731,12 +731,12 @@ then AC_MSG_RESULT([Not building uuidd]) UUIDD_CMT="#" else - AC_DEFINE(USE_UUIDD) + AC_DEFINE(USE_UUIDD, 1) UUIDD_CMT="" AC_MSG_RESULT([Building uuidd]) fi] , -AC_DEFINE(USE_UUIDD) +AC_DEFINE(USE_UUIDD, 1) UUIDD_CMT="" AC_MSG_RESULT([Building uuidd by default]) ) @@ -753,8 +753,8 @@ GETTEXT_PACKAGE=e2fsprogs PACKAGE=e2fsprogs VERSION="$E2FSPROGS_VERSION" VERSION=0.14.1 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [package name for gettext]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [version for gettext]) AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -821,16 +821,19 @@ AC_CHECK_HEADERS(net/if.h,,, AC_FUNC_VPRINTF dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen dnl is not decleared. -AC_CHECK_MEMBER(struct dirent.d_reclen,[AC_DEFINE(HAVE_RECLEN_DIRENT)],, +AC_CHECK_MEMBER(struct dirent.d_reclen,[AC_DEFINE(HAVE_RECLEN_DIRENT, 1, + [Define to 1 if dirent has d_reclen])],, [#include <dirent.h>]) -dnl Check to see if ssize_t was decleared -AC_CHECK_TYPE(ssize_t,[AC_DEFINE(HAVE_TYPE_SSIZE_T)],, +dnl Check to see if ssize_t was declared +AC_CHECK_TYPE(ssize_t,[AC_DEFINE(HAVE_TYPE_SSIZE_T, 1, + [Define to 1 if ssize_t declared])],, [#include <sys/types.h>]) dnl dnl Check to see if llseek() is declared in unistd.h. On some libc's dnl it is, and on others it isn't..... Thank you glibc developers.... dnl -AC_CHECK_DECL(llseek,[AC_DEFINE(HAVE_LLSEEK_PROTOTYPE)],, +AC_CHECK_DECL(llseek,[AC_DEFINE(HAVE_LLSEEK_PROTOTYPE, 1, + [Define to 1 if llseek declared in unistd.h])],, [#include <unistd.h>]) dnl dnl Check to see if lseek64() is declared in unistd.h. Glibc's header files @@ -841,7 +844,8 @@ dnl dnl Warning! Use of --enable-gcc-wall may throw off this test. dnl dnl -AC_CHECK_DECL(lseek64,[AC_DEFINE(HAVE_LSEEK64_PROTOTYPE)],, +AC_CHECK_DECL(lseek64,[AC_DEFINE(HAVE_LSEEK64_PROTOTYPE, 1, + [Define to 1 if lseek64 declared in unistd.h])],, [#define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE #include <unistd.h>]) @@ -908,14 +912,16 @@ if test "$e2fsprogs_cv_struct_st_flags" = yes; then [e2fsprogs_cv_struct_st_flags_immut=no])) AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags_immut) if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then - AC_DEFINE(HAVE_STAT_FLAGS) + AC_DEFINE(HAVE_STAT_FLAGS, 1, + [Define to 1 if struct stat has st_flags]) fi fi dnl dnl Check for the presence of SA_LEN dnl AC_CHECK_MEMBER(struct sockaddr.sa_len, - AC_DEFINE_UNQUOTED(HAVE_SA_LEN,1,[Define if struct sockaddr contains sa_len]),, + AC_DEFINE_UNQUOTED(HAVE_SA_LEN,1, + [Define to 1 if if struct sockaddr contains sa_len]),, [#include <sys/types.h> #include <sys/socket.h>]) dnl @@ -943,21 +949,22 @@ AC_CACHE_VAL(ac_cv_have_optreset, ac_cv_have_optreset=yes, ac_cv_have_optreset=no)])dnl AC_MSG_RESULT($ac_cv_have_optreset) if test $ac_cv_have_optreset = yes; then - AC_DEFINE(HAVE_OPTRESET) + AC_DEFINE(HAVE_OPTRESET, 1, [Define to 1 if optreset for getopt is present]) fi dnl dnl Test for sem_init, and which library it might require: dnl +AH_TEMPLATE([HAVE_SEM_INIT], [Define to 1 if sem_init() exists]) SEM_INIT_LIB='' AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(pthread, sem_init, - AC_DEFINE(HAVE_SEM_INIT) + AC_DEFINE(HAVE_SEM_INIT, 1) SEM_INIT_LIB=-lpthread, AC_CHECK_LIB(rt, sem_init, - AC_DEFINE(HAVE_SEM_INIT) + AC_DEFINE(HAVE_SEM_INIT, 1) SEM_INIT_LIB=-lrt, AC_CHECK_LIB(posix4, sem_init, - AC_DEFINE(HAVE_SEM_INIT) + AC_DEFINE(HAVE_SEM_INIT, 1) SEM_INIT_LIB=-lposix4))))dnl AC_SUBST(SEM_INIT_LIB) dnl @@ -976,7 +983,7 @@ dnl We use the EXT2 ioctls only under Linux dnl case "$host_os" in linux*) - AC_DEFINE(HAVE_EXT2_IOCTLS) + AC_DEFINE(HAVE_EXT2_IOCTLS, 1, [Define to 1 if Ext2 ioctls present]) ;; esac dnl @@ -1095,7 +1102,8 @@ dnl case "$host_os" in darwin*) AC_MSG_RESULT([Using Apple Darwin / GNU libintl workaround]) - AC_DEFINE(_INTL_REDIRECT_MACROS) + AC_DEFINE(_INTL_REDIRECT_MACROS, 1, + [Define to 1 if Apple Darwin libintl workaround is needed]) ;; esac dnl @@ -1116,12 +1124,15 @@ fi AC_SUBST(DO_TEST_SUITE) dnl dnl Only include the intl include files if we're building with them -dnl -INTL_FLAGS= +dnl +INCLUDES='-I. -I$(top_builddir)/lib -I$(top_srcdir)/lib' +if test -n "$CPPFLAGS" ; then + INCLUDES="$INCLUDES $CPPFLAGS" +fi if test "$USE_INCLUDED_LIBINTL" = "yes" ; then - INTL_FLAGS='-I$(top_builddir)/intl -I$(top_srcdir)/intl' + INCLUDES=$INCLUDES' -I$(top_builddir)/intl -I$(top_srcdir)/intl' fi -AC_SUBST(INTL_FLAGS) +AC_SUBST(INCLUDES) dnl dnl Build CFLAGS dnl diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 4b29260a..cfaaed15 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -8,6 +8,7 @@ * Modifications by Robert Sanders <gt8134b@prism.gatech.edu> */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/dump.c b/debugfs/dump.c index ec36eca4..a15a0b73 100644 --- a/debugfs/dump.c +++ b/debugfs/dump.c @@ -9,6 +9,7 @@ #define _GNU_SOURCE /* for O_LARGEFILE */ #endif +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/htree.c b/debugfs/htree.c index de36bd4a..06e77371 100644 --- a/debugfs/htree.c +++ b/debugfs/htree.c @@ -5,6 +5,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/icheck.c b/debugfs/icheck.c index 729ac930..c7f1597d 100644 --- a/debugfs/icheck.c +++ b/debugfs/icheck.c @@ -5,6 +5,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/logdump.c b/debugfs/logdump.c index d1e64fd5..6e39b74c 100644 --- a/debugfs/logdump.c +++ b/debugfs/logdump.c @@ -9,6 +9,7 @@ * License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/ls.c b/debugfs/ls.c index e01fd204..ed75fd18 100644 --- a/debugfs/ls.c +++ b/debugfs/ls.c @@ -5,6 +5,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c index ba7a90f6..bed0ce61 100644 --- a/debugfs/lsdel.c +++ b/debugfs/lsdel.c @@ -6,6 +6,7 @@ * the GNU Public License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/ncheck.c b/debugfs/ncheck.c index a366281e..739e0014 100644 --- a/debugfs/ncheck.c +++ b/debugfs/ncheck.c @@ -5,6 +5,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c index 06d0ad87..1d5d630d 100644 --- a/debugfs/set_fields.c +++ b/debugfs/set_fields.c @@ -17,6 +17,7 @@ #define STRTOULL strtoul #endif +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/unused.c b/debugfs/unused.c index b78d70b8..4cb11918 100644 --- a/debugfs/unused.c +++ b/debugfs/unused.c @@ -5,6 +5,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/debugfs/util.c b/debugfs/util.c index 34fc1795..1a237307 100644 --- a/debugfs/util.c +++ b/debugfs/util.c @@ -8,6 +8,7 @@ #define _XOPEN_SOURCE 600 /* needed for strptime */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index ccbc5c3f..b5336a43 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -14,7 +14,6 @@ INSTALL = @INSTALL@ PROGS= e2fsck MANPAGES= e2fsck.8 FMANPAGES= e2fsck.conf.5 -XTRA_CFLAGS= -DRESOURCE_TRACK -I. LIBS= $(LIBQUOTA) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) \ $(LIBINTL) $(LIBE2P) @@ -280,187 +279,231 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -e2fsck.o: $(srcdir)/e2fsck.c $(srcdir)/e2fsck.h \ +e2fsck.o: $(srcdir)/e2fsck.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -crc32.o: $(srcdir)/crc32.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/crc32defs.h crc32table.h -gen_crc32table.o: $(srcdir)/gen_crc32table.c $(srcdir)/crc32defs.h -dict.o: $(srcdir)/dict.c $(srcdir)/dict.h -super.o: $(srcdir)/super.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +crc32.o: $(srcdir)/crc32.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -pass1.o: $(srcdir)/pass1.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/crc32defs.h crc32table.h +gen_crc32table.o: $(srcdir)/gen_crc32table.c $(top_builddir)/lib/config.h \ + $(srcdir)/crc32defs.h +dict.o: $(srcdir)/dict.c $(top_builddir)/lib/config.h $(srcdir)/dict.h +super.o: $(srcdir)/super.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -pass1b.o: $(srcdir)/pass1b.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ - $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ - $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/dict.h -pass2.o: $(srcdir)/pass2.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +pass1.o: $(srcdir)/pass1.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/dict.h -pass3.o: $(srcdir)/pass3.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +pass1b.o: $(srcdir)/pass1b.c $(top_builddir)/lib/config.h \ + $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -pass4.o: $(srcdir)/pass4.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h $(srcdir)/dict.h +pass2.o: $(srcdir)/pass2.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -pass5.o: $(srcdir)/pass5.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h $(srcdir)/dict.h +pass3.o: $(srcdir)/pass3.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -journal.o: $(srcdir)/journal.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +pass4.o: $(srcdir)/pass4.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ - $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h -recovery.o: $(srcdir)/recovery.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ +pass5.o: $(srcdir)/pass5.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ - $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h -revoke.o: $(srcdir)/revoke.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +journal.o: $(srcdir)/journal.c $(top_builddir)/lib/config.h \ + $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ - $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h -badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ + $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/problem.h +recovery.o: $(srcdir)/recovery.c $(top_builddir)/lib/config.h \ + $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ - $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h -util.o: $(srcdir)/util.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ + $(top_srcdir)/lib/ext2fs/kernel-list.h +revoke.o: $(srcdir)/revoke.c $(top_builddir)/lib/config.h \ + $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h -unix.o: $(srcdir)/unix.c $(top_srcdir)/lib/e2p/e2p.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ + $(top_srcdir)/lib/ext2fs/kernel-list.h +badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(top_srcdir)/version.h -dirinfo.o: $(srcdir)/dirinfo.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/tdb.h -dx_dirinfo.o: $(srcdir)/dx_dirinfo.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +unix.o: $(srcdir)/unix.c $(top_builddir)/lib/config.h \ + $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h -ehandler.o: $(srcdir)/ehandler.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h $(top_srcdir)/version.h +dirinfo.o: $(srcdir)/dirinfo.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h -problem.o: $(srcdir)/problem.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(top_srcdir)/lib/ext2fs/tdb.h +dx_dirinfo.o: $(srcdir)/dx_dirinfo.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/problemP.h -message.o: $(srcdir)/message.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +ehandler.o: $(srcdir)/ehandler.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -ea_refcount.o: $(srcdir)/ea_refcount.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +problem.o: $(srcdir)/problem.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h -rehash.o: $(srcdir)/rehash.c $(srcdir)/e2fsck.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h $(srcdir)/problemP.h +message.o: $(srcdir)/message.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h -region.o: $(srcdir)/region.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +ea_refcount.o: $(srcdir)/ea_refcount.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +rehash.o: $(srcdir)/rehash.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h -profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/profile.h prof_err.h -sigcatcher.o: $(srcdir)/sigcatcher.c $(srcdir)/e2fsck.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h +region.o: $(srcdir)/region.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \ + $(top_srcdir)/lib/et/com_err.h $(srcdir)/profile.h prof_err.h +sigcatcher.o: $(srcdir)/sigcatcher.c $(top_builddir)/lib/config.h \ + $(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h prof_err.o: prof_err.c -quota.o: $(srcdir)/quota.c $(srcdir)/e2fsck.h $(top_srcdir)/lib/quota/mkquota.h\ +quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(srcdir)/problem.h + $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h \ + $(srcdir)/problem.h diff --git a/e2fsck/argv_parse.c b/e2fsck/argv_parse.c index c0c5bbe9..d22f6344 100644 --- a/e2fsck/argv_parse.c +++ b/e2fsck/argv_parse.c @@ -28,6 +28,7 @@ * Version 1.1, modified 2/27/1999 */ +#include "config.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/e2fsck/badblocks.c b/e2fsck/badblocks.c index fa183b85..71b1c56e 100644 --- a/e2fsck/badblocks.c +++ b/e2fsck/badblocks.c @@ -5,6 +5,7 @@ * redistributed under the terms of the GNU Public License. */ +#include "config.h" #include <time.h> #ifdef HAVE_ERRNO_H #include <errno.h> diff --git a/e2fsck/crc32.c b/e2fsck/crc32.c index f092c03a..0497a380 100644 --- a/e2fsck/crc32.c +++ b/e2fsck/crc32.c @@ -31,6 +31,7 @@ * Version 2. See the file COPYING for more details. */ +#include "config.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/e2fsck/dict.c b/e2fsck/dict.c index 722b5b1c..90c4d840 100644 --- a/e2fsck/dict.c +++ b/e2fsck/dict.c @@ -26,6 +26,7 @@ #define EXT2FS_ATTR(x) #endif +#include "config.h" #include <stdlib.h> #include <stddef.h> #include <assert.h> diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c index ca73c31f..e98795cf 100644 --- a/e2fsck/dirinfo.c +++ b/e2fsck/dirinfo.c @@ -7,6 +7,7 @@ #undef DIRINFO_DEBUG +#include "config.h" #include "e2fsck.h" #include <sys/stat.h> #include <fcntl.h> diff --git a/e2fsck/dx_dirinfo.c b/e2fsck/dx_dirinfo.c index 5c48d328..7838a406 100644 --- a/e2fsck/dx_dirinfo.c +++ b/e2fsck/dx_dirinfo.c @@ -5,6 +5,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include "e2fsck.h" #ifdef ENABLE_HTREE diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c index f1da97a3..38718408 100644 --- a/e2fsck/e2fsck.c +++ b/e2fsck/e2fsck.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <errno.h> #include "e2fsck.h" diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index 1c1603b9..88ab84ed 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -127,6 +127,8 @@ struct dx_dirblock_info { #define DX_FLAG_FIRST 4 #define DX_FLAG_LAST 8 +#define RESOURCE_TRACK + #ifdef RESOURCE_TRACK /* * This structure is used for keeping track of how much resources have diff --git a/e2fsck/ea_refcount.c b/e2fsck/ea_refcount.c index b10cfffa..115bd6f2 100644 --- a/e2fsck/ea_refcount.c +++ b/e2fsck/ea_refcount.c @@ -5,6 +5,7 @@ * redistributed under the terms of the GNU Public License. */ +#include "config.h" #if HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/e2fsck/ehandler.c b/e2fsck/ehandler.c index 10216db2..6eecf33f 100644 --- a/e2fsck/ehandler.c +++ b/e2fsck/ehandler.c @@ -6,6 +6,7 @@ * under the terms of the GNU Public License. */ +#include "config.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/e2fsck/emptydir.c b/e2fsck/emptydir.c index cf9b521e..a3bfd46f 100644 --- a/e2fsck/emptydir.c +++ b/e2fsck/emptydir.c @@ -12,6 +12,7 @@ * blocks and get rid of them. */ +#include "config.h" #include "e2fsck.h" #include "problem.h" diff --git a/e2fsck/extend.c b/e2fsck/extend.c index 2a849b21..bdb62c3e 100644 --- a/e2fsck/extend.c +++ b/e2fsck/extend.c @@ -8,6 +8,7 @@ * License. */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/e2fsck/flushb.c b/e2fsck/flushb.c index 95ca6f8d..6100fc61 100644 --- a/e2fsck/flushb.c +++ b/e2fsck/flushb.c @@ -13,6 +13,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <unistd.h> diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c index 84e2cc17..f5286b74 100644 --- a/e2fsck/iscan.c +++ b/e2fsck/iscan.c @@ -3,6 +3,7 @@ * anything else) */ +#include "config.h" #include <string.h> #include <fcntl.h> #include <ctype.h> diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 6d350ee1..561ff340 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -12,6 +12,7 @@ * any later version. */ +#include "config.h" #ifdef HAVE_SYS_MOUNT_H #include <sys/param.h> #include <sys/mount.h> diff --git a/e2fsck/message.c b/e2fsck/message.c index f1783219..25fe72e1 100644 --- a/e2fsck/message.c +++ b/e2fsck/message.c @@ -86,6 +86,7 @@ * @z zero-length */ +#include "config.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/e2fsck/mtrace.c b/e2fsck/mtrace.c index f34f19a9..2b7b34a6 100644 --- a/e2fsck/mtrace.c +++ b/e2fsck/mtrace.c @@ -21,6 +21,8 @@ Cambridge, MA 02139, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ +#include "config.h" + #ifndef _MALLOC_INTERNAL #define _MALLOC_INTERNAL #include "./mtrace.h" diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 4c3fe3f1..ddaa802a 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -38,6 +38,7 @@ */ #define _GNU_SOURCE 1 /* get strnlen() */ +#include "config.h" #include <string.h> #include <time.h> #ifdef HAVE_ERRNO_H diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c index 08584820..4011dea2 100644 --- a/e2fsck/pass1b.c +++ b/e2fsck/pass1b.c @@ -27,6 +27,7 @@ * */ +#include "config.h" #include <time.h> #ifdef HAVE_ERRNO_H #include <errno.h> diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 43ba5b29..0ba29577 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -42,6 +42,7 @@ */ #define _GNU_SOURCE 1 /* get strnlen() */ +#include "config.h" #include <string.h> #include "e2fsck.h" diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c index e3d2ef70..7164aa99 100644 --- a/e2fsck/pass3.c +++ b/e2fsck/pass3.c @@ -34,6 +34,7 @@ * - The dirinfo directory information cache. */ +#include "config.h" #ifdef HAVE_ERRNO_H #include <errno.h> #endif diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c index 4b845f68..1e632807 100644 --- a/e2fsck/pass4.c +++ b/e2fsck/pass4.c @@ -13,6 +13,7 @@ * - A bitmap of which inodes are imagic inodes. (inode_imagic_map) */ +#include "config.h" #include "e2fsck.h" #include "problem.h" #include <ext2fs/ext2_ext_attr.h> diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c index d4b08686..a60e84ad 100644 --- a/e2fsck/pass5.c +++ b/e2fsck/pass5.c @@ -10,6 +10,7 @@ * */ +#include "config.h" #include <stdint.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/e2fsck/problem.c b/e2fsck/problem.c index eb29bc0c..0d56983e 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/e2fsck/profile.c b/e2fsck/profile.c index f4267b14..019c6f58 100644 --- a/e2fsck/profile.c +++ b/e2fsck/profile.c @@ -48,6 +48,7 @@ * */ +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/e2fsck/profile_helpers.c b/e2fsck/profile_helpers.c index c6b5c444..9c9080a1 100644 --- a/e2fsck/profile_helpers.c +++ b/e2fsck/profile_helpers.c @@ -18,6 +18,7 @@ * %End-Header% */ +#include "config.h" #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/e2fsck/quota.c b/e2fsck/quota.c index 54b8d23b..20a0b240 100644 --- a/e2fsck/quota.c +++ b/e2fsck/quota.c @@ -3,6 +3,7 @@ * */ +#include "config.h" #ifdef HAVE_SYS_MOUNT_H #include <sys/param.h> #include <sys/mount.h> diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index cac9294c..a587bd72 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -14,6 +14,7 @@ */ #ifndef __KERNEL__ +#include "config.h" #include "jfs_user.h" #else #include <linux/time.h> diff --git a/e2fsck/region.c b/e2fsck/region.c index e50c8a44..2d593561 100644 --- a/e2fsck/region.c +++ b/e2fsck/region.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #if HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c index e8af323f..15993b3f 100644 --- a/e2fsck/rehash.c +++ b/e2fsck/rehash.c @@ -45,6 +45,7 @@ * require that e2fsck use VM first. */ +#include "config.h" #include <string.h> #include <ctype.h> #include <errno.h> diff --git a/e2fsck/revoke.c b/e2fsck/revoke.c index c43e40e9..38c265e4 100644 --- a/e2fsck/revoke.c +++ b/e2fsck/revoke.c @@ -58,6 +58,7 @@ */ #ifndef __KERNEL__ +#include "config.h" #include "jfs_user.h" #else #include <linux/sched.h> diff --git a/e2fsck/scantest.c b/e2fsck/scantest.c index ed586b1c..852ff86b 100644 --- a/e2fsck/scantest.c +++ b/e2fsck/scantest.c @@ -2,6 +2,7 @@ * scantest.c - test the speed of the inode scan routine */ +#include "config.h" #include <string.h> #include <fcntl.h> #include <ctype.h> diff --git a/e2fsck/sigcatcher.c b/e2fsck/sigcatcher.c index 83f912de..b0bc132d 100644 --- a/e2fsck/sigcatcher.c +++ b/e2fsck/sigcatcher.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <signal.h> diff --git a/e2fsck/super.c b/e2fsck/super.c index 14251abc..36e7309c 100644 --- a/e2fsck/super.c +++ b/e2fsck/super.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #ifdef HAVE_ERRNO_H #include <errno.h> #endif diff --git a/e2fsck/unix.c b/e2fsck/unix.c index a787d398..511648e7 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -11,6 +11,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */ +#include "config.h" #include <stdio.h> #ifdef HAVE_STDLIB_H #include <stdlib.h> diff --git a/e2fsck/util.c b/e2fsck/util.c index fb9a87a9..a15986de 100644 --- a/e2fsck/util.c +++ b/e2fsck/util.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in index 610635a0..b3b606a6 100644 --- a/ext2ed/Makefile.in +++ b/ext2ed/Makefile.in @@ -16,8 +16,7 @@ MANPAGES= ext2ed.8 DOC_DIR = $datadir/doc/ext2ed -XTRA_CFLAGS = $(FLAGS) -DETC_DIR=\"$(root_sysconfdir)\" -LIBS = -lncurses +LIBS = -lncurses $(LIBEXT2FS) SRCS= $(srcdir)/main.c $(srcdir)/init.c $(srcdir)/general_com.c \ $(srcdir)/inode_com.c $(srcdir)/dir_com.c $(srcdir)/super_com.c \ diff --git a/ext2ed/blockbitmap_com.c b/ext2ed/blockbitmap_com.c index 996bbeb4..53e61dc8 100644 --- a/ext2ed/blockbitmap_com.c +++ b/ext2ed/blockbitmap_com.c @@ -16,6 +16,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/dir_com.c b/ext2ed/dir_com.c index b023e7a3..ba852676 100644 --- a/ext2ed/dir_com.c +++ b/ext2ed/dir_com.c @@ -28,6 +28,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/disk.c b/ext2ed/disk.c index 5e1cd7e2..5c243127 100644 --- a/ext2ed/disk.c +++ b/ext2ed/disk.c @@ -22,6 +22,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/ext2_com.c b/ext2ed/ext2_com.c index 2f20a28d..ed004f28 100644 --- a/ext2ed/ext2_com.c +++ b/ext2ed/ext2_com.c @@ -16,6 +16,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/ext2ed.h b/ext2ed/ext2ed.h index 2ee483e8..b9b43b47 100644 --- a/ext2ed/ext2ed.h +++ b/ext2ed/ext2ed.h @@ -28,10 +28,6 @@ Copyright (C) 1995 Gadi Oxman */ -#ifndef ETC_DIR -#define ETC_DIR "/etc" /* Where to find the config file */ -#endif - #define DEBUG /* Activate self-sanity checks */ #include <ext2fs/ext2_fs.h> /* Main kernel ext2 include file */ diff --git a/ext2ed/file_com.c b/ext2ed/file_com.c index 9772f66d..d6679599 100644 --- a/ext2ed/file_com.c +++ b/ext2ed/file_com.c @@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/general_com.c b/ext2ed/general_com.c index 03dc2615..c9b2ffc4 100644 --- a/ext2ed/general_com.c +++ b/ext2ed/general_com.c @@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/group_com.c b/ext2ed/group_com.c index 25325533..aaed16e4 100644 --- a/ext2ed/group_com.c +++ b/ext2ed/group_com.c @@ -12,6 +12,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/init.c b/ext2ed/init.c index 3815ab56..7d9b526f 100644 --- a/ext2ed/init.c +++ b/ext2ed/init.c @@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -487,7 +488,7 @@ int process_configuration_file (void) char option [80],value [80]; FILE *fp; - strcpy (buffer, ETC_DIR); + strcpy (buffer, ROOT_SYSCONFDIR); strcat (buffer,"/ext2ed.conf"); if ((fp=fopen (buffer,"rt"))==NULL) { diff --git a/ext2ed/inode_com.c b/ext2ed/inode_com.c index 8d4b9f33..2d3dd6d6 100644 --- a/ext2ed/inode_com.c +++ b/ext2ed/inode_com.c @@ -12,6 +12,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/inodebitmap_com.c b/ext2ed/inodebitmap_com.c index e6022344..157807a2 100644 --- a/ext2ed/inodebitmap_com.c +++ b/ext2ed/inodebitmap_com.c @@ -16,6 +16,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/main.c b/ext2ed/main.c index 50a3f07f..4a29979b 100644 --- a/ext2ed/main.c +++ b/ext2ed/main.c @@ -22,6 +22,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/super_com.c b/ext2ed/super_com.c index 57953ab6..a998970e 100644 --- a/ext2ed/super_com.c +++ b/ext2ed/super_com.c @@ -14,6 +14,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ext2ed/win.c b/ext2ed/win.c index 113a28f3..23d0da13 100644 --- a/ext2ed/win.c +++ b/ext2ed/win.c @@ -17,6 +17,7 @@ Copyright (C) 1995 Gadi Oxman */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/intl/Makefile.in b/intl/Makefile.in index 47f6f629..9dbc84e9 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -73,7 +73,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ -Dset_relocation_prefix=libintl_set_relocation_prefix \ -Drelocate=libintl_relocate \ --DDEPENDS_ON_LIBICONV=1 @DEFS@ +-DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -252,7 +252,7 @@ ref-del.sed: $(srcdir)/ref-del.sin $(Q) sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed $(Q) mv t-ref-del.sed ref-del.sed -INCLUDES = -I. -I$(srcdir) -I.. +INCLUDES = -I. -I$(srcdir) -I.. -I$(top_builddir)/lib libgnuintl.h: $(srcdir)/libgnuintl.h.in $(E) " SED libgnuintl.h " diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c index 2b818868..73900a51 100644 --- a/lib/blkid/cache.c +++ b/lib/blkid/cache.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #if HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c index 128a869d..6d8eaeac 100644 --- a/lib/blkid/dev.c +++ b/lib/blkid/dev.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdlib.h> #include <string.h> diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c index b151354d..a6673c17 100644 --- a/lib/blkid/devname.c +++ b/lib/blkid/devname.c @@ -13,6 +13,7 @@ #define _GNU_SOURCE 1 +#include "config.h" #include <stdio.h> #include <string.h> #include <limits.h> diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c index c9f5c92c..479d9776 100644 --- a/lib/blkid/devno.c +++ b/lib/blkid/devno.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c index 10ba7ecf..77e68cf7 100644 --- a/lib/blkid/getsize.c +++ b/lib/blkid/getsize.c @@ -13,6 +13,7 @@ #define _LARGEFILE64_SOURCE /* include this before sys/queues.h! */ +#include "config.h" #include "blkidP.h" #include <stdio.h> diff --git a/lib/blkid/llseek.c b/lib/blkid/llseek.c index 5bd0e516..658acc97 100644 --- a/lib/blkid/llseek.c +++ b/lib/blkid/llseek.c @@ -12,6 +12,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index e6131fb1..6970b122 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -13,6 +13,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/lib/blkid/read.c b/lib/blkid/read.c index ca2798f0..efc348b9 100644 --- a/lib/blkid/read.c +++ b/lib/blkid/read.c @@ -12,6 +12,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of strtoull */ +#include "config.h" #include <stdio.h> #include <ctype.h> #include <string.h> diff --git a/lib/blkid/resolve.c b/lib/blkid/resolve.c index 6c2e268d..3bc37b0c 100644 --- a/lib/blkid/resolve.c +++ b/lib/blkid/resolve.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/blkid/save.c b/lib/blkid/save.c index 6802e9dc..6c20168b 100644 --- a/lib/blkid/save.c +++ b/lib/blkid/save.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/lib/blkid/tag.c b/lib/blkid/tag.c index 639ef89e..1eae7df7 100644 --- a/lib/blkid/tag.c +++ b/lib/blkid/tag.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <unistd.h> #include <stdlib.h> #include <string.h> diff --git a/lib/blkid/tst_types.c b/lib/blkid/tst_types.c index 3003c8b5..cb612aeb 100644 --- a/lib/blkid/tst_types.c +++ b/lib/blkid/tst_types.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <sys/types.h> #include "blkid/blkid_types.h" diff --git a/lib/blkid/version.c b/lib/blkid/version.c index c9754fab..54c17aa6 100644 --- a/lib/blkid/version.c +++ b/lib/blkid/version.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #if HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/lib/config.h.in b/lib/config.h.in new file mode 100644 index 00000000..04613d6c --- /dev/null +++ b/lib/config.h.in @@ -0,0 +1,602 @@ +/* lib/config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + +/* Define to 1 if debugging the blkid library */ +#undef CONFIG_BLKID_DEBUG + +/* Define to 1 to compile findfs */ +#undef CONFIG_BUILD_FINDFS + +/* Define to 1 if debugging ext3/4 journal code */ +#undef CONFIG_JBD_DEBUG + +/* Define to 1 if the testio I/O manager should be enabled */ +#undef CONFIG_TESTIO_DEBUG + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END + +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA + +/* Define to 1 if ext2 compression enabled */ +#undef ENABLE_COMPRESSION + +/* Define to 1 if ext3/4 htree support enabled */ +#undef ENABLE_HTREE + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + +/* Define to 1 if you have the <argz.h> header file. */ +#undef HAVE_ARGZ_H + +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + +/* Define to 1 if you have the `backtrace' function. */ +#undef HAVE_BACKTRACE + +/* Define to 1 if you have the `blkid_probe_get_topology' function. */ +#undef HAVE_BLKID_PROBE_GET_TOPOLOGY + +/* Define to 1 if you have the `chflags' function. */ +#undef HAVE_CHFLAGS + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#undef HAVE_DECL_FEOF_UNLOCKED + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#undef HAVE_DECL_FGETS_UNLOCKED + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#undef HAVE_DECL_GETC_UNLOCKED + +/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you + don't. */ +#undef HAVE_DECL__SNPRINTF + +/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you + don't. */ +#undef HAVE_DECL__SNWPRINTF + +/* Define to 1 if you have the <dirent.h> header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if dlopen/libdl exists */ +#undef HAVE_DLOPEN + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the <errno.h> header file. */ +#undef HAVE_ERRNO_H + +/* Define to 1 if you have the <execinfo.h> header file. */ +#undef HAVE_EXECINFO_H + +/* Define to 1 if Ext2 ioctls present */ +#undef HAVE_EXT2_IOCTLS + +/* Define to 1 if you have the `fallocate' function. */ +#undef HAVE_FALLOCATE + +/* Define to 1 if you have the `fallocate64' function. */ +#undef HAVE_FALLOCATE64 + +/* Define to 1 if you have the `fchown' function. */ +#undef HAVE_FCHOWN + +/* Define to 1 if you have the `fdatasync' function. */ +#undef HAVE_FDATASYNC + +/* Define to 1 if you have the `fstat64' function. */ +#undef HAVE_FSTAT64 + +/* Define to 1 if you have the `ftruncate64' function. */ +#undef HAVE_FTRUNCATE64 + +/* Define to 1 if you have the `fwprintf' function. */ +#undef HAVE_FWPRINTF + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the `getdtablesize' function. */ +#undef HAVE_GETDTABLESIZE + +/* Define to 1 if you have the `getegid' function. */ +#undef HAVE_GETEGID + +/* Define to 1 if you have the `geteuid' function. */ +#undef HAVE_GETEUID + +/* Define to 1 if you have the `getgid' function. */ +#undef HAVE_GETGID + +/* Define to 1 if you have the `getmntinfo' function. */ +#undef HAVE_GETMNTINFO + +/* Define to 1 if you have the <getopt.h> header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* Define to 1 if you have the `getuid' function. */ +#undef HAVE_GETUID + +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ +#undef HAVE_INTMAX_T + +/* Define to 1 if the system has the type `intptr_t'. */ +#undef HAVE_INTPTR_T + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and + declares uintmax_t. */ +#undef HAVE_INTTYPES_H_WITH_UINTMAX + +/* Define to 1 if you have the `jrand48' function. */ +#undef HAVE_JRAND48 + +/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + +/* Define if your <locale.h> file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the <linux/falloc.h> header file. */ +#undef HAVE_LINUX_FALLOC_H + +/* Define to 1 if you have the <linux/fd.h> header file. */ +#undef HAVE_LINUX_FD_H + +/* Define to 1 if you have the <linux/major.h> header file. */ +#undef HAVE_LINUX_MAJOR_H + +/* Define to 1 if you have the `llseek' function. */ +#undef HAVE_LLSEEK + +/* Define to 1 if llseek declared in unistd.h */ +#undef HAVE_LLSEEK_PROTOTYPE + +/* Define to 1 if you have the <locale.h> header file. */ +#undef HAVE_LOCALE_H + +/* Define if you have the 'long double' type. */ +#undef HAVE_LONG_DOUBLE + +/* Define if you have the 'long long' type. */ +#undef HAVE_LONG_LONG + +/* Define to 1 if you have the `lseek64' function. */ +#undef HAVE_LSEEK64 + +/* Define to 1 if lseek64 declared in unistd.h */ +#undef HAVE_LSEEK64_PROTOTYPE + +/* Define to 1 if you have the `mallinfo' function. */ +#undef HAVE_MALLINFO + +/* Define to 1 if you have the <malloc.h> header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the `mbstowcs' function. */ +#undef HAVE_MBSTOWCS + +/* Define to 1 if you have the `memalign' function. */ +#undef HAVE_MEMALIGN + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mempcpy' function. */ +#undef HAVE_MEMPCPY + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the <mntent.h> header file. */ +#undef HAVE_MNTENT_H + +/* Define to 1 if you have the `munmap' function. */ +#undef HAVE_MUNMAP + +/* Define to 1 if you have the `nanosleep' function. */ +#undef HAVE_NANOSLEEP + +/* Define to 1 if you have the <netinet/in.h> header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the <net/if_dl.h> header file. */ +#undef HAVE_NET_IF_DL_H + +/* Define to 1 if you have the <net/if.h> header file. */ +#undef HAVE_NET_IF_H + +/* Define to 1 if you have the <nl_types.h> header file. */ +#undef HAVE_NL_TYPES_H + +/* Define to 1 if you have the `open64' function. */ +#undef HAVE_OPEN64 + +/* Define to 1 if optreset for getopt is present */ +#undef HAVE_OPTRESET + +/* Define to 1 if you have the `pathconf' function. */ +#undef HAVE_PATHCONF + +/* Define to 1 if you have the <paths.h> header file. */ +#undef HAVE_PATHS_H + +/* Define to 1 if you have the `posix_fadvise' function. */ +#undef HAVE_POSIX_FADVISE + +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN + +/* Define if your printf() function supports format strings with positions. */ +#undef HAVE_POSIX_PRINTF + +/* Define to 1 if you have the `prctl' function. */ +#undef HAVE_PRCTL + +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV + +/* Define to 1 if dirent has d_reclen */ +#undef HAVE_RECLEN_DIRENT + +/* Define to 1 if if struct sockaddr contains sa_len */ +#undef HAVE_SA_LEN + +/* Define to 1 if you have the <semaphore.h> header file. */ +#undef HAVE_SEMAPHORE_H + +/* Define to 1 if sem_init() exists */ +#undef HAVE_SEM_INIT + +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV + +/* Define to 1 if you have the <setjmp.h> header file. */ +#undef HAVE_SETJMP_H + +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + +/* Define to 1 if you have the `setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the `setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the <signal.h> header file. */ +#undef HAVE_SIGNAL_H + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `srandom' function. */ +#undef HAVE_SRANDOM + +/* Define to 1 if struct stat has st_flags */ +#undef HAVE_STAT_FLAGS + +/* Define to 1 if you have the <stdarg.h> header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the <stddef.h> header file. */ +#undef HAVE_STDDEF_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares + uintmax_t. */ +#undef HAVE_STDINT_H_WITH_UINTMAX + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `stpcpy' function. */ +#undef HAVE_STPCPY + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + +/* Define to 1 if you have the `strptime' function. */ +#undef HAVE_STRPTIME + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL + +/* Define to 1 if you have the `strtoull' function. */ +#undef HAVE_STRTOULL + +/* Define to 1 if you have the `sync_file_range' function. */ +#undef HAVE_SYNC_FILE_RANGE + +/* Define to 1 if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define to 1 if you have the <sys/disklabel.h> header file. */ +#undef HAVE_SYS_DISKLABEL_H + +/* Define to 1 if you have the <sys/disk.h> header file. */ +#undef HAVE_SYS_DISK_H + +/* Define to 1 if you have the <sys/file.h> header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define to 1 if you have the <sys/mkdev.h> header file. */ +#undef HAVE_SYS_MKDEV_H + +/* Define to 1 if you have the <sys/mman.h> header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the <sys/mount.h> header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the <sys/prctl.h> header file. */ +#undef HAVE_SYS_PRCTL_H + +/* Define to 1 if you have the <sys/queue.h> header file. */ +#undef HAVE_SYS_QUEUE_H + +/* Define to 1 if you have the <sys/resource.h> header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the <sys/select.h> header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the <sys/socket.h> header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the <sys/sockio.h> header file. */ +#undef HAVE_SYS_SOCKIO_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/syscall.h> header file. */ +#undef HAVE_SYS_SYSCALL_H + +/* Define to 1 if you have the <sys/sysmacros.h> header file. */ +#undef HAVE_SYS_SYSMACROS_H + +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <sys/un.h> header file. */ +#undef HAVE_SYS_UN_H + +/* Define to 1 if you have the <sys/wait.h> header file. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the <termios.h> header file. */ +#undef HAVE_TERMIOS_H + +/* Define to 1 if you have the <termio.h> header file. */ +#undef HAVE_TERMIO_H + +/* Define to 1 if you have the `tsearch' function. */ +#undef HAVE_TSEARCH + +/* Define to 1 if ssize_t declared */ +#undef HAVE_TYPE_SSIZE_T + +/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */ +#undef HAVE_UINTMAX_T + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define if you have the 'unsigned long long' type. */ +#undef HAVE_UNSIGNED_LONG_LONG + +/* Define to 1 if you have the `usleep' function. */ +#undef HAVE_USLEEP + +/* Define to 1 if you have the `utime' function. */ +#undef HAVE_UTIME + +/* Define to 1 if you have the <utime.h> header file. */ +#undef HAVE_UTIME_H + +/* Define to 1 if you have the `valloc' function. */ +#undef HAVE_VALLOC + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define if you have the 'wchar_t' type. */ +#undef HAVE_WCHAR_T + +/* Define to 1 if you have the `wcslen' function. */ +#undef HAVE_WCSLEN + +/* Define if you have the 'wint_t' type. */ +#undef HAVE_WINT_T + +/* Define to 1 if you have the `__argz_count' function. */ +#undef HAVE___ARGZ_COUNT + +/* Define to 1 if you have the `__argz_next' function. */ +#undef HAVE___ARGZ_NEXT + +/* Define to 1 if you have the `__argz_stringify' function. */ +#undef HAVE___ARGZ_STRINGIFY + +/* Define to 1 if you have the `__fsetlocking' function. */ +#undef HAVE___FSETLOCKING + +/* Define to 1 if you have the `__secure_getenv' function. */ +#undef HAVE___SECURE_GETENV + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST + +/* Define if integer division by zero raises signal SIGFPE. */ +#undef INTDIV0_RAISES_SIGFPE + +/* package name for gettext */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if <inttypes.h> exists and defines unusable PRI* macros. */ +#undef PRI_MACROS_BROKEN + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + +/* The size of `short', as computed by sizeof. */ +#undef SIZEOF_SHORT + +/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +#undef SIZE_MAX + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* If the compiler supports a TLS storage class define it to that here */ +#undef TLS + +/* Define to 1 to build uuidd */ +#undef USE_UUIDD + +/* version for gettext */ +#undef VERSION + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif + +/* Define to 1 if Apple Darwin libintl workaround is needed */ +#undef _INTL_REDIRECT_MACROS + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to `long int' if <sys/types.h> does not define. */ +#undef off_t + +/* Define as the type of the result of subtracting two pointers, if the system + doesn't define it. */ +#undef ptrdiff_t + +/* Define to empty if the C compiler doesn't support this keyword. */ +#undef signed + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#undef size_t + +/* Define to unsigned long or unsigned long long if <stdint.h> and + <inttypes.h> don't define. */ +#undef uintmax_t + +#include "dirpaths.h" diff --git a/lib/dirpaths.h.in b/lib/dirpaths.h.in new file mode 100644 index 00000000..6ccb55be --- /dev/null +++ b/lib/dirpaths.h.in @@ -0,0 +1,10 @@ +/* + * This file contains the path names for various directories as + * controlled by the configure script. + */ + +/* Where to put the messages file for internationalization support */ +#define LOCALEDIR "@datadir@/locale" + +/* Where to find the mke2fs.conf and e2fsck.conf files */ +#define ROOT_SYSCONFDIR "@root_sysconfdir@" diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in index 9775a987..e2d09402 100644 --- a/lib/e2p/Makefile.in +++ b/lib/e2p/Makefile.in @@ -116,7 +116,8 @@ $(OBJS): subdirs # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -feature.o: $(srcdir)/feature.c $(srcdir)/e2p.h \ +feature.o: $(srcdir)/feature.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ @@ -124,41 +125,60 @@ feature.o: $(srcdir)/feature.c $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/lib/ext2fs/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \ $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h -fgetflags.o: $(srcdir)/fgetflags.c $(srcdir)/e2p.h \ +fgetflags.o: $(srcdir)/fgetflags.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -fsetflags.o: $(srcdir)/fsetflags.c $(srcdir)/e2p.h \ +fsetflags.o: $(srcdir)/fsetflags.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -fgetversion.o: $(srcdir)/fgetversion.c $(srcdir)/e2p.h \ +fgetversion.o: $(srcdir)/fgetversion.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -fsetversion.o: $(srcdir)/fsetversion.c $(srcdir)/e2p.h \ +fsetversion.o: $(srcdir)/fsetversion.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -getflags.o: $(srcdir)/getflags.c $(srcdir)/e2p.h \ +getflags.o: $(srcdir)/getflags.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -getversion.o: $(srcdir)/getversion.c $(srcdir)/e2p.h \ +getversion.o: $(srcdir)/getversion.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -hashstr.o: $(srcdir)/hashstr.c $(srcdir)/e2p.h \ +hashstr.o: $(srcdir)/hashstr.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -iod.o: $(srcdir)/iod.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h -ls.o: $(srcdir)/ls.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h -mntopts.o: $(srcdir)/mntopts.c $(srcdir)/e2p.h \ +iod.o: $(srcdir)/iod.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -parse_num.o: $(srcdir)/parse_num.c $(srcdir)/e2p.h \ +ls.o: $(srcdir)/ls.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -pe.o: $(srcdir)/pe.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h -pf.o: $(srcdir)/pf.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h -ps.o: $(srcdir)/ps.c $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ - $(top_builddir)/lib/ext2fs/ext2_types.h -setflags.o: $(srcdir)/setflags.c $(srcdir)/e2p.h \ +mntopts.o: $(srcdir)/mntopts.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -setversion.o: $(srcdir)/setversion.c $(srcdir)/e2p.h \ +parse_num.o: $(srcdir)/parse_num.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -uuid.o: $(srcdir)/uuid.c $(top_builddir)/lib/ext2fs/ext2_types.h \ +pe.o: $(srcdir)/pe.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h +pf.o: $(srcdir)/pf.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h +ps.o: $(srcdir)/ps.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h +setflags.o: $(srcdir)/setflags.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h +setversion.o: $(srcdir)/setversion.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ + $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h +uuid.o: $(srcdir)/uuid.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h -ostype.o: $(srcdir)/ostype.c $(srcdir)/e2p.h \ +ostype.o: $(srcdir)/ostype.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h -percent.o: $(srcdir)/percent.c $(srcdir)/e2p.h \ +percent.o: $(srcdir)/percent.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c index ef4376a2..916d0fe1 100644 --- a/lib/e2p/feature.c +++ b/lib/e2p/feature.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/e2p/fgetflags.c b/lib/e2p/fgetflags.c index ca3ea166..2af84627 100644 --- a/lib/e2p/fgetflags.c +++ b/lib/e2p/fgetflags.c @@ -19,6 +19,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/fgetversion.c b/lib/e2p/fgetversion.c index 37946f77..e6cee8bf 100644 --- a/lib/e2p/fgetversion.c +++ b/lib/e2p/fgetversion.c @@ -19,6 +19,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/fsetflags.c b/lib/e2p/fsetflags.c index 08dd114d..167d16e8 100644 --- a/lib/e2p/fsetflags.c +++ b/lib/e2p/fsetflags.c @@ -19,6 +19,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/fsetversion.c b/lib/e2p/fsetversion.c index fc50cb1e..d41d59f9 100644 --- a/lib/e2p/fsetversion.c +++ b/lib/e2p/fsetversion.c @@ -19,6 +19,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/getflags.c b/lib/e2p/getflags.c index e8716848..e4e2ad73 100644 --- a/lib/e2p/getflags.c +++ b/lib/e2p/getflags.c @@ -16,6 +16,7 @@ * 93/10/30 - Creation */ +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/getversion.c b/lib/e2p/getversion.c index eb0e5202..e7c6feca 100644 --- a/lib/e2p/getversion.c +++ b/lib/e2p/getversion.c @@ -16,6 +16,7 @@ * 93/10/30 - Creation */ +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/hashstr.c b/lib/e2p/hashstr.c index 5ee62370..a73758c7 100644 --- a/lib/e2p/hashstr.c +++ b/lib/e2p/hashstr.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/e2p/iod.c b/lib/e2p/iod.c index c53aafeb..6a030dd4 100644 --- a/lib/e2p/iod.c +++ b/lib/e2p/iod.c @@ -16,6 +16,7 @@ * 93/10/30 - Creation */ +#include "config.h" #include "e2p.h" #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c index aaacdaa4..259eea14 100644 --- a/lib/e2p/ls.c +++ b/lib/e2p/ls.c @@ -13,6 +13,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/lib/e2p/mntopts.c b/lib/e2p/mntopts.c index 9d3879e3..d56cc527 100644 --- a/lib/e2p/mntopts.c +++ b/lib/e2p/mntopts.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/e2p/ostype.c b/lib/e2p/ostype.c index 978315b8..d002e75d 100644 --- a/lib/e2p/ostype.c +++ b/lib/e2p/ostype.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include "e2p.h" #include <string.h> #include <stdlib.h> diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c index 9ca67998..d9ad3e74 100644 --- a/lib/e2p/parse_num.c +++ b/lib/e2p/parse_num.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include "e2p.h" #include <stdlib.h> diff --git a/lib/e2p/pe.c b/lib/e2p/pe.c index 78c80993..1f24545d 100644 --- a/lib/e2p/pe.c +++ b/lib/e2p/pe.c @@ -16,6 +16,7 @@ * 94/01/09 - Creation */ +#include "config.h" #include <stdio.h> #include "e2p.h" diff --git a/lib/e2p/percent.c b/lib/e2p/percent.c index cfa7046e..e340cd76 100644 --- a/lib/e2p/percent.c +++ b/lib/e2p/percent.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include "e2p.h" #include <stdlib.h> diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c index f34a5cc3..f03193c0 100644 --- a/lib/e2p/pf.c +++ b/lib/e2p/pf.c @@ -16,6 +16,7 @@ * 93/10/30 - Creation */ +#include "config.h" #include <stdio.h> #include "e2p.h" diff --git a/lib/e2p/ps.c b/lib/e2p/ps.c index e6ad60ab..757f8a66 100644 --- a/lib/e2p/ps.c +++ b/lib/e2p/ps.c @@ -16,6 +16,7 @@ * 93/12/22 - Creation */ +#include "config.h" #include <stdio.h> #include "e2p.h" diff --git a/lib/e2p/setflags.c b/lib/e2p/setflags.c index b203606f..0f6a3e04 100644 --- a/lib/e2p/setflags.c +++ b/lib/e2p/setflags.c @@ -16,6 +16,7 @@ * 93/10/30 - Creation */ +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/setversion.c b/lib/e2p/setversion.c index d72270b6..202834f1 100644 --- a/lib/e2p/setversion.c +++ b/lib/e2p/setversion.c @@ -16,6 +16,7 @@ * 93/10/30 - Creation */ +#include "config.h" #if HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/e2p/uuid.c b/lib/e2p/uuid.c index 310b01de..a1020927 100644 --- a/lib/e2p/uuid.c +++ b/lib/e2p/uuid.c @@ -7,6 +7,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <ext2fs/ext2_types.h> diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in index 19aa7d29..26a33608 100644 --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@ -148,12 +148,16 @@ $(OBJS): subdirs # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -error_message.o: $(srcdir)/error_message.c $(srcdir)/com_err.h \ - $(srcdir)/error_table.h $(srcdir)/internal.h -et_name.o: $(srcdir)/et_name.c $(srcdir)/com_err.h $(srcdir)/error_table.h \ +error_message.o: $(srcdir)/error_message.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/com_err.h $(srcdir)/error_table.h \ $(srcdir)/internal.h -init_et.o: $(srcdir)/init_et.c $(srcdir)/com_err.h $(srcdir)/error_table.h -com_err.o: $(srcdir)/com_err.c $(srcdir)/com_err.h $(srcdir)/error_table.h \ +et_name.o: $(srcdir)/et_name.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/com_err.h $(srcdir)/error_table.h \ $(srcdir)/internal.h -com_right.o: $(srcdir)/com_right.c $(srcdir)/com_err.h \ - $(srcdir)/error_table.h +init_et.o: $(srcdir)/init_et.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/com_err.h $(srcdir)/error_table.h +com_err.o: $(srcdir)/com_err.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/com_err.h $(srcdir)/error_table.h \ + $(srcdir)/internal.h +com_right.o: $(srcdir)/com_right.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/com_err.h $(srcdir)/error_table.h diff --git a/lib/et/com_err.c b/lib/et/com_err.c index e5af13cd..4ea52def 100644 --- a/lib/et/com_err.c +++ b/lib/et/com_err.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> #ifdef HAVE_TERMIOS_H #include <termios.h> diff --git a/lib/et/com_right.c b/lib/et/com_right.c index f00e9104..2cceb54c 100644 --- a/lib/et/com_right.c +++ b/lib/et/com_right.c @@ -38,6 +38,7 @@ * SUCH DAMAGE. */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/et/error_message.c b/lib/et/error_message.c index 1b08c166..94bc3b1e 100644 --- a/lib/et/error_message.c +++ b/lib/et/error_message.c @@ -16,6 +16,7 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/et/et_name.c b/lib/et/et_name.c index 18883269..6b59eddb 100644 --- a/lib/et/et_name.c +++ b/lib/et/et_name.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #include "com_err.h" #include "error_table.h" #include "internal.h" diff --git a/lib/et/init_et.c b/lib/et/init_et.c index bf27da11..772660d8 100644 --- a/lib/et/init_et.c +++ b/lib/et/init_et.c @@ -16,6 +16,7 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> #include <errno.h> #ifdef HAVE_STDLIB_H diff --git a/lib/et/vfprintf.c b/lib/et/vfprintf.c index a1dc1e8c..e3fcd78c 100644 --- a/lib/et/vfprintf.c +++ b/lib/et/vfprintf.c @@ -19,6 +19,7 @@ static char sccsid[] = "@(#)vfprintf.c 5.2 (Berkeley) 6/27/88"; #endif /* LIBC_SCCS and not lint */ +#include "config.h" #if !HAVE_VPRINTF && HAVE_DOPRNT #include <stdio.h> #include <varargs.h> diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index d2684021..77e18d88 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -7,8 +7,6 @@ INSTALL = @INSTALL@ @MCONFIG@ -XTRA_CFLAGS= -I. - @DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o inode_io.o write_bb_file.o MK_CMDS= _SS_DIR_OVERRIDE=../ss ../ss/mk_cmds @@ -426,381 +424,456 @@ crc32c_table.h: gen_crc32ctable # the Makefile.in file # ext2_err.o: ext2_err.c -alloc.o: $(srcdir)/alloc.c $(srcdir)/ext2_fs.h \ +alloc.o: $(srcdir)/alloc.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -alloc_sb.o: $(srcdir)/alloc_sb.c $(srcdir)/ext2_fs.h \ +alloc_sb.o: $(srcdir)/alloc_sb.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -alloc_stats.o: $(srcdir)/alloc_stats.c $(srcdir)/ext2_fs.h \ +alloc_stats.o: $(srcdir)/alloc_stats.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -alloc_tables.o: $(srcdir)/alloc_tables.c $(srcdir)/ext2_fs.h \ +alloc_tables.o: $(srcdir)/alloc_tables.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/ext2fsP.h -badblocks.o: $(srcdir)/badblocks.c $(srcdir)/ext2_fs.h \ +badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -bb_compat.o: $(srcdir)/bb_compat.c $(srcdir)/ext2_fs.h \ +bb_compat.o: $(srcdir)/bb_compat.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -bb_inode.o: $(srcdir)/bb_inode.c $(srcdir)/ext2_fs.h \ +bb_inode.o: $(srcdir)/bb_inode.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -bitmaps.o: $(srcdir)/bitmaps.c $(srcdir)/ext2_fs.h \ +bitmaps.o: $(srcdir)/bitmaps.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/ext2fsP.h \ $(srcdir)/bmap64.h -bitops.o: $(srcdir)/bitops.c $(srcdir)/ext2_fs.h \ +bitops.o: $(srcdir)/bitops.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -blkmap64_ba.o: $(srcdir)/blkmap64_ba.c $(srcdir)/ext2_fs.h \ +blkmap64_ba.o: $(srcdir)/blkmap64_ba.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/bmap64.h -block.o: $(srcdir)/block.c $(srcdir)/ext2_fs.h \ +block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -bmap.o: $(srcdir)/bmap.c $(srcdir)/ext2_fs.h \ +bmap.o: $(srcdir)/bmap.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -check_desc.o: $(srcdir)/check_desc.c $(srcdir)/ext2_fs.h \ +check_desc.o: $(srcdir)/check_desc.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -closefs.o: $(srcdir)/closefs.c $(srcdir)/ext2_fs.h \ +closefs.o: $(srcdir)/closefs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -crc16.o: $(srcdir)/crc16.c $(top_builddir)/lib/ext2fs/ext2_types.h \ +crc16.o: $(srcdir)/crc16.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(srcdir)/crc16.h -crc32c.o: $(srcdir)/crc32c.c $(srcdir)/crc32c_defs.h crc32c_table.h +crc32c.o: $(srcdir)/crc32c.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/crc32c_defs.h crc32c_table.h gen_crc32ctable.o: $(srcdir)/gen_crc32ctable.c $(srcdir)/crc32c_defs.h -csum.o: $(srcdir)/csum.c $(srcdir)/ext2_fs.h \ +csum.o: $(srcdir)/csum.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/crc16.h -dblist.o: $(srcdir)/dblist.c $(srcdir)/ext2_fs.h \ +dblist.o: $(srcdir)/dblist.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -dblist_dir.o: $(srcdir)/dblist_dir.c $(srcdir)/ext2_fs.h \ +dblist_dir.o: $(srcdir)/dblist_dir.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -dirblock.o: $(srcdir)/dirblock.c $(srcdir)/ext2_fs.h \ +dirblock.o: $(srcdir)/dirblock.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -dirhash.o: $(srcdir)/dirhash.c $(srcdir)/ext2_fs.h \ +dirhash.o: $(srcdir)/dirhash.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -dir_iterate.o: $(srcdir)/dir_iterate.c $(srcdir)/ext2_fs.h \ +dir_iterate.o: $(srcdir)/dir_iterate.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -dupfs.o: $(srcdir)/dupfs.c $(srcdir)/ext2_fs.h \ +dupfs.o: $(srcdir)/dupfs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -expanddir.o: $(srcdir)/expanddir.c $(srcdir)/ext2_fs.h \ +expanddir.o: $(srcdir)/expanddir.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -ext_attr.o: $(srcdir)/ext_attr.c $(srcdir)/ext2_fs.h \ +ext_attr.o: $(srcdir)/ext_attr.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -extent.o: $(srcdir)/extent.c $(srcdir)/ext2_fs.h \ +extent.o: $(srcdir)/extent.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/e2image.h -fileio.o: $(srcdir)/fileio.c $(srcdir)/ext2_fs.h \ +fileio.o: $(srcdir)/fileio.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -finddev.o: $(srcdir)/finddev.c $(srcdir)/ext2_fs.h \ +finddev.o: $(srcdir)/finddev.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -flushb.o: $(srcdir)/flushb.c $(srcdir)/ext2_fs.h \ +flushb.o: $(srcdir)/flushb.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -freefs.o: $(srcdir)/freefs.c $(srcdir)/ext2_fs.h \ +freefs.o: $(srcdir)/freefs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -gen_bitmap.o: $(srcdir)/gen_bitmap.c $(srcdir)/ext2_fs.h \ +gen_bitmap.o: $(srcdir)/gen_bitmap.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h -gen_bitmap64.o: $(srcdir)/gen_bitmap64.c $(srcdir)/ext2_fs.h \ +gen_bitmap64.o: $(srcdir)/gen_bitmap64.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/bmap64.h -get_pathname.o: $(srcdir)/get_pathname.c $(srcdir)/ext2_fs.h \ +get_pathname.o: $(srcdir)/get_pathname.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -getsize.o: $(srcdir)/getsize.c $(srcdir)/ext2_fs.h \ +getsize.o: $(srcdir)/getsize.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -getsectsize.o: $(srcdir)/getsectsize.c $(srcdir)/ext2_fs.h \ +getsectsize.o: $(srcdir)/getsectsize.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -i_block.o: $(srcdir)/i_block.c $(srcdir)/ext2_fs.h \ +i_block.o: $(srcdir)/i_block.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -icount.o: $(srcdir)/icount.c $(srcdir)/ext2_fs.h \ +icount.o: $(srcdir)/icount.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/tdb.h -ind_block.o: $(srcdir)/ind_block.c $(srcdir)/ext2_fs.h \ +ind_block.o: $(srcdir)/ind_block.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -initialize.o: $(srcdir)/initialize.c $(srcdir)/ext2_fs.h \ +initialize.o: $(srcdir)/initialize.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -inline.o: $(srcdir)/inline.c $(srcdir)/ext2_fs.h \ +inline.o: $(srcdir)/inline.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -inode.o: $(srcdir)/inode.c $(srcdir)/ext2_fs.h \ +inode.o: $(srcdir)/inode.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/e2image.h -inode_io.o: $(srcdir)/inode_io.c $(srcdir)/ext2_fs.h \ +inode_io.o: $(srcdir)/inode_io.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -imager.o: $(srcdir)/imager.c $(srcdir)/ext2_fs.h \ +imager.o: $(srcdir)/imager.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -io_manager.o: $(srcdir)/io_manager.c $(srcdir)/ext2_fs.h \ +io_manager.o: $(srcdir)/io_manager.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -ismounted.o: $(srcdir)/ismounted.c $(srcdir)/ext2_fs.h \ +ismounted.o: $(srcdir)/ismounted.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -link.o: $(srcdir)/link.c $(srcdir)/ext2_fs.h \ +link.o: $(srcdir)/link.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -llseek.o: $(srcdir)/llseek.c $(top_srcdir)/lib/et/com_err.h \ +llseek.o: $(srcdir)/llseek.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h -lookup.o: $(srcdir)/lookup.c $(srcdir)/ext2_fs.h \ +lookup.o: $(srcdir)/lookup.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -mkdir.o: $(srcdir)/mkdir.c $(srcdir)/ext2_fs.h \ +mkdir.o: $(srcdir)/mkdir.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -mkjournal.o: $(srcdir)/mkjournal.c $(srcdir)/ext2_fs.h \ +mkjournal.o: $(srcdir)/mkjournal.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/e2p/e2p.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext2fs.h $(srcdir)/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/jfs_user.h $(srcdir)/kernel-jbd.h \ $(srcdir)/jfs_compat.h $(srcdir)/kernel-list.h -namei.o: $(srcdir)/namei.c $(srcdir)/ext2_fs.h \ +namei.o: $(srcdir)/namei.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -native.o: $(srcdir)/native.c $(srcdir)/ext2_fs.h \ +native.o: $(srcdir)/native.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -newdir.o: $(srcdir)/newdir.c $(srcdir)/ext2_fs.h \ +newdir.o: $(srcdir)/newdir.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -openfs.o: $(srcdir)/openfs.c $(srcdir)/ext2_fs.h \ +openfs.o: $(srcdir)/openfs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/e2image.h -progress.o: $(srcdir)/progress.c $(srcdir)/ext2fs.h \ +progress.o: $(srcdir)/progress.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_fs.h \ $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/ext2fsP.h -punch.o: $(srcdir)/punch.c $(srcdir)/ext2_fs.h \ +punch.o: $(srcdir)/punch.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -qcow2.o: $(srcdir)/qcow2.c $(srcdir)/ext2fs.h \ +qcow2.o: $(srcdir)/qcow2.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_fs.h \ $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \ $(srcdir)/bitops.h $(srcdir)/qcow2.h -read_bb.o: $(srcdir)/read_bb.c $(srcdir)/ext2_fs.h \ +read_bb.o: $(srcdir)/read_bb.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -read_bb_file.o: $(srcdir)/read_bb_file.c $(srcdir)/ext2_fs.h \ +read_bb_file.o: $(srcdir)/read_bb_file.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -res_gdt.o: $(srcdir)/res_gdt.c $(srcdir)/ext2_fs.h \ +res_gdt.o: $(srcdir)/res_gdt.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -rw_bitmaps.o: $(srcdir)/rw_bitmaps.c $(srcdir)/ext2_fs.h \ +rw_bitmaps.o: $(srcdir)/rw_bitmaps.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/e2image.h -swapfs.o: $(srcdir)/swapfs.c $(srcdir)/ext2_fs.h \ +swapfs.o: $(srcdir)/swapfs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -tdb.o: $(srcdir)/tdb.c $(srcdir)/tdb.h -test_io.o: $(srcdir)/test_io.c $(srcdir)/ext2_fs.h \ +tdb.o: $(srcdir)/tdb.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/tdb.h +test_io.o: $(srcdir)/test_io.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -tst_badblocks.o: $(srcdir)/tst_badblocks.c $(srcdir)/ext2_fs.h \ +tst_badblocks.o: $(srcdir)/tst_badblocks.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -tst_bitops.o: $(srcdir)/tst_bitops.c $(srcdir)/ext2_fs.h \ +tst_bitops.o: $(srcdir)/tst_bitops.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -tst_byteswap.o: $(srcdir)/tst_byteswap.c $(srcdir)/ext2_fs.h \ +tst_byteswap.o: $(srcdir)/tst_byteswap.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -tst_getsize.o: $(srcdir)/tst_getsize.c $(srcdir)/ext2_fs.h \ +tst_getsize.o: $(srcdir)/tst_getsize.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -tst_iscan.o: $(srcdir)/tst_iscan.c $(srcdir)/ext2_fs.h \ +tst_iscan.o: $(srcdir)/tst_iscan.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -undo_io.o: $(srcdir)/undo_io.c $(srcdir)/tdb.h $(srcdir)/ext2_fs.h \ +undo_io.o: $(srcdir)/undo_io.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/tdb.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -unix_io.o: $(srcdir)/unix_io.c $(srcdir)/ext2_fs.h \ +unix_io.o: $(srcdir)/unix_io.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -unlink.o: $(srcdir)/unlink.c $(srcdir)/ext2_fs.h \ +unlink.o: $(srcdir)/unlink.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -valid_blk.o: $(srcdir)/valid_blk.c $(srcdir)/ext2_fs.h \ +valid_blk.o: $(srcdir)/valid_blk.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h -version.o: $(srcdir)/version.c $(srcdir)/ext2_fs.h \ +version.o: $(srcdir)/version.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(top_srcdir)/version.h -write_bb_file.o: $(srcdir)/write_bb_file.c $(srcdir)/ext2_fs.h \ +write_bb_file.o: $(srcdir)/write_bb_file.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c index 7583aaf3..948a0ecb 100644 --- a/lib/ext2fs/alloc.c +++ b/lib/ext2fs/alloc.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/alloc_sb.c b/lib/ext2fs/alloc_sb.c index 2e323894..0d1c0000 100644 --- a/lib/ext2fs/alloc_sb.c +++ b/lib/ext2fs/alloc_sb.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/alloc_stats.c b/lib/ext2fs/alloc_stats.c index 9a6697e0..adec3636 100644 --- a/lib/ext2fs/alloc_stats.c +++ b/lib/ext2fs/alloc_stats.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include "ext2_fs.h" diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c index 885d2b23..9f3d4e04 100644 --- a/lib/ext2fs/alloc_tables.c +++ b/lib/ext2fs/alloc_tables.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/badblocks.c b/lib/ext2fs/badblocks.c index 4312e190..0f23983b 100644 --- a/lib/ext2fs/badblocks.c +++ b/lib/ext2fs/badblocks.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/bb_compat.c b/lib/ext2fs/bb_compat.c index a94e3e48..373792a2 100644 --- a/lib/ext2fs/bb_compat.c +++ b/lib/ext2fs/bb_compat.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/bb_inode.c b/lib/ext2fs/bb_inode.c index 0b6c3dd2..268eecf8 100644 --- a/lib/ext2fs/bb_inode.c +++ b/lib/ext2fs/bb_inode.c @@ -13,6 +13,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c index b38590f4..e518295d 100644 --- a/lib/ext2fs/bitmaps.c +++ b/lib/ext2fs/bitmaps.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/bitops.c b/lib/ext2fs/bitops.c index a3f72c31..9322a353 100644 --- a/lib/ext2fs/bitops.c +++ b/lib/ext2fs/bitops.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/lib/ext2fs/blkmap64_ba.c b/lib/ext2fs/blkmap64_ba.c index 395aba97..9253af20 100644 --- a/lib/ext2fs/blkmap64_ba.c +++ b/lib/ext2fs/blkmap64_ba.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c index b9ac36cf..fd203b4d 100644 --- a/lib/ext2fs/blknum.c +++ b/lib/ext2fs/blknum.c @@ -11,6 +11,7 @@ * %End-Header% */ +#include "config.h" #include "ext2fs.h" /* diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c index 95ad31e2..6a5c10df 100644 --- a/lib/ext2fs/block.c +++ b/lib/ext2fs/block.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c index 7a515be4..16d51e0b 100644 --- a/lib/ext2fs/bmap.c +++ b/lib/ext2fs/bmap.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/bmove.c b/lib/ext2fs/bmove.c index deabf38c..d0579985 100644 --- a/lib/ext2fs/bmove.c +++ b/lib/ext2fs/bmove.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/brel_ma.c b/lib/ext2fs/brel_ma.c index 1a55702b..e8a8280e 100644 --- a/lib/ext2fs/brel_ma.c +++ b/lib/ext2fs/brel_ma.c @@ -12,6 +12,7 @@ * %End-Header% */ +#include "config.h" #include <fcntl.h> #include <stdio.h> #include <string.h> diff --git a/lib/ext2fs/check_desc.c b/lib/ext2fs/check_desc.c index d0ca75b3..a6fcc454 100644 --- a/lib/ext2fs/check_desc.c +++ b/lib/ext2fs/check_desc.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c index 51ef63cb..9141944e 100644 --- a/lib/ext2fs/closefs.c +++ b/lib/ext2fs/closefs.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/crc16.c b/lib/ext2fs/crc16.c index 026f040b..2fdeb24e 100644 --- a/lib/ext2fs/crc16.c +++ b/lib/ext2fs/crc16.c @@ -5,6 +5,7 @@ * Version 2. See the file COPYING for more details. */ +#include "config.h" #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/lib/ext2fs/crc32c.c b/lib/ext2fs/crc32c.c index 0ad19b62..c9b610bf 100644 --- a/lib/ext2fs/crc32c.c +++ b/lib/ext2fs/crc32c.c @@ -28,6 +28,7 @@ * This source code is licensed under the GNU General Public License, * Version 2. See the file COPYING for more details. */ +#include "config.h" #include <stdint.h> #include <endian.h> #include <stdlib.h> diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c index 2fece689..596923e5 100644 --- a/lib/ext2fs/csum.c +++ b/lib/ext2fs/csum.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c index ead8c7a5..ca1446b9 100644 --- a/lib/ext2fs/dblist.c +++ b/lib/ext2fs/dblist.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c index 07ed8afa..d4d51114 100644 --- a/lib/ext2fs/dblist_dir.c +++ b/lib/ext2fs/dblist_dir.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/dir_iterate.c b/lib/ext2fs/dir_iterate.c index 88f6b476..5125d199 100644 --- a/lib/ext2fs/dir_iterate.c +++ b/lib/ext2fs/dir_iterate.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/dirblock.c b/lib/ext2fs/dirblock.c index 73e1f0ab..cb3a104c 100644 --- a/lib/ext2fs/dirblock.c +++ b/lib/ext2fs/dirblock.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/dirhash.c b/lib/ext2fs/dirhash.c index 5477bfbc..c4ac94e0 100644 --- a/lib/ext2fs/dirhash.c +++ b/lib/ext2fs/dirhash.c @@ -11,6 +11,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/lib/ext2fs/dosio.c b/lib/ext2fs/dosio.c index ff3bda69..0defff8a 100644 --- a/lib/ext2fs/dosio.c +++ b/lib/ext2fs/dosio.c @@ -11,6 +11,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <bios.h> #include <string.h> diff --git a/lib/ext2fs/dupfs.c b/lib/ext2fs/dupfs.c index a9e2a976..64d31248 100644 --- a/lib/ext2fs/dupfs.c +++ b/lib/ext2fs/dupfs.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c index 8f738c8c..41c40882 100644 --- a/lib/ext2fs/expanddir.c +++ b/lib/ext2fs/expanddir.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c index ddcc89f7..1889824c 100644 --- a/lib/ext2fs/ext_attr.c +++ b/lib/ext2fs/ext_attr.c @@ -11,6 +11,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c index 6d2afb0f..eb096d6a 100644 --- a/lib/ext2fs/extent.c +++ b/lib/ext2fs/extent.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c index 324f0464..d56f5b50 100644 --- a/lib/ext2fs/fileio.c +++ b/lib/ext2fs/fileio.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c index cc2029f2..13ef14bf 100644 --- a/lib/ext2fs/finddev.c +++ b/lib/ext2fs/finddev.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/flushb.c b/lib/ext2fs/flushb.c index ee0093ad..ac8923cb 100644 --- a/lib/ext2fs/flushb.c +++ b/lib/ext2fs/flushb.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_ERRNO_H #include <errno.h> diff --git a/lib/ext2fs/freefs.c b/lib/ext2fs/freefs.c index 5c35bb68..52ff5708 100644 --- a/lib/ext2fs/freefs.c +++ b/lib/ext2fs/freefs.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/gen_bitmap.c b/lib/ext2fs/gen_bitmap.c index 3650013d..6679bffa 100644 --- a/lib/ext2fs/gen_bitmap.c +++ b/lib/ext2fs/gen_bitmap.c @@ -10,6 +10,7 @@ */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c index 06f5ce9b..9dbbf9fb 100644 --- a/lib/ext2fs/gen_bitmap64.c +++ b/lib/ext2fs/gen_bitmap64.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/get_pathname.c b/lib/ext2fs/get_pathname.c index 7ac14db2..e259eee7 100644 --- a/lib/ext2fs/get_pathname.c +++ b/lib/ext2fs/get_pathname.c @@ -21,6 +21,7 @@ * */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/getsectsize.c b/lib/ext2fs/getsectsize.c index f129be16..9d615531 100644 --- a/lib/ext2fs/getsectsize.c +++ b/lib/ext2fs/getsectsize.c @@ -13,6 +13,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c index 41da6b94..690349c5 100644 --- a/lib/ext2fs/getsize.c +++ b/lib/ext2fs/getsize.c @@ -15,6 +15,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/i_block.c b/lib/ext2fs/i_block.c index f36c3c47..5ca57e49 100644 --- a/lib/ext2fs/i_block.c +++ b/lib/ext2fs/i_block.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c index 9223f662..1a18b377 100644 --- a/lib/ext2fs/icount.c +++ b/lib/ext2fs/icount.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #if HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c index 5a6d0b95..a0fb81e4 100644 --- a/lib/ext2fs/imager.c +++ b/lib/ext2fs/imager.c @@ -13,6 +13,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/ind_block.c b/lib/ext2fs/ind_block.c index 722d3bdc..aa82ae6b 100644 --- a/lib/ext2fs/ind_block.c +++ b/lib/ext2fs/ind_block.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c index 2a10578a..47f0b1ca 100644 --- a/lib/ext2fs/initialize.c +++ b/lib/ext2fs/initialize.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/inline.c b/lib/ext2fs/inline.c index f9be368b..02deda18 100644 --- a/lib/ext2fs/inline.c +++ b/lib/ext2fs/inline.c @@ -12,6 +12,7 @@ */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c index 7889a9f9..6c524ff2 100644 --- a/lib/ext2fs/inode.c +++ b/lib/ext2fs/inode.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/inode_io.c b/lib/ext2fs/inode_io.c index ced32448..8e0944ef 100644 --- a/lib/ext2fs/inode_io.c +++ b/lib/ext2fs/inode_io.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/io_manager.c b/lib/ext2fs/io_manager.c index 80f9dfcb..25df59ec 100644 --- a/lib/ext2fs/io_manager.c +++ b/lib/ext2fs/io_manager.c @@ -2,6 +2,7 @@ * io_manager.c --- the I/O manager abstraction */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/irel_ma.c b/lib/ext2fs/irel_ma.c index b0557906..c64b7e76 100644 --- a/lib/ext2fs/irel_ma.c +++ b/lib/ext2fs/irel_ma.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <fcntl.h> #include <stdio.h> #include <string.h> diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c index 2e9df4e0..823eb3fe 100644 --- a/lib/ext2fs/ismounted.c +++ b/lib/ext2fs/ismounted.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/link.c b/lib/ext2fs/link.c index 0fd3ea86..2d03b573 100644 --- a/lib/ext2fs/link.c +++ b/lib/ext2fs/link.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c index 7855590b..b0576e40 100644 --- a/lib/ext2fs/llseek.c +++ b/lib/ext2fs/llseek.c @@ -12,6 +12,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/lib/ext2fs/lookup.c b/lib/ext2fs/lookup.c index 97aa0887..0e66e712 100644 --- a/lib/ext2fs/lookup.c +++ b/lib/ext2fs/lookup.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/mkdir.c b/lib/ext2fs/mkdir.c index 9b6b7996..b12bf2dd 100644 --- a/lib/ext2fs/mkdir.c +++ b/lib/ext2fs/mkdir.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c index aaad2f60..838d751c 100644 --- a/lib/ext2fs/mkjournal.c +++ b/lib/ext2fs/mkjournal.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/namei.c b/lib/ext2fs/namei.c index bc0ae61d..6bbb1240 100644 --- a/lib/ext2fs/namei.c +++ b/lib/ext2fs/namei.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/native.c b/lib/ext2fs/native.c index c71a95ee..ba3e0c8e 100644 --- a/lib/ext2fs/native.c +++ b/lib/ext2fs/native.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include "ext2_fs.h" diff --git a/lib/ext2fs/newdir.c b/lib/ext2fs/newdir.c index 6bc57194..b0a1e476 100644 --- a/lib/ext2fs/newdir.c +++ b/lib/ext2fs/newdir.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c index 0b4df38a..a986bebb 100644 --- a/lib/ext2fs/openfs.c +++ b/lib/ext2fs/openfs.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/progress.c b/lib/ext2fs/progress.c index 1b9bf9ca..37d15096 100644 --- a/lib/ext2fs/progress.c +++ b/lib/ext2fs/progress.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include "ext2fs.h" #include "ext2fsP.h" diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c index 2f24b5ef..b53653a0 100644 --- a/lib/ext2fs/punch.c +++ b/lib/ext2fs/punch.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/qcow2.c b/lib/ext2fs/qcow2.c index 4553c5ed..b0a02783 100644 --- a/lib/ext2fs/qcow2.c +++ b/lib/ext2fs/qcow2.c @@ -26,6 +26,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <fcntl.h> #include <grp.h> #include <pwd.h> diff --git a/lib/ext2fs/read_bb.c b/lib/ext2fs/read_bb.c index e5d63227..b5a0d7b4 100644 --- a/lib/ext2fs/read_bb.c +++ b/lib/ext2fs/read_bb.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/read_bb_file.c b/lib/ext2fs/read_bb_file.c index 25454a87..7d7bb7aa 100644 --- a/lib/ext2fs/read_bb_file.c +++ b/lib/ext2fs/read_bb_file.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/res_gdt.c b/lib/ext2fs/res_gdt.c index acce650d..6449228c 100644 --- a/lib/ext2fs/res_gdt.c +++ b/lib/ext2fs/res_gdt.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <time.h> diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c index b6fcc3c0..1d5f7b2b 100644 --- a/lib/ext2fs/rw_bitmaps.c +++ b/lib/ext2fs/rw_bitmaps.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/sparse.c b/lib/ext2fs/sparse.c index 63c11f61..3a0877b8 100644 --- a/lib/ext2fs/sparse.c +++ b/lib/ext2fs/sparse.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include "ext2_fs.h" diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c index b5bedf34..bc6d569d 100644 --- a/lib/ext2fs/swapfs.c +++ b/lib/ext2fs/swapfs.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c index 0c82a248..28d40c50 100644 --- a/lib/ext2fs/tdb.c +++ b/lib/ext2fs/tdb.c @@ -38,6 +38,7 @@ Last Changed Date: 2007-06-22 13:36:10 -0400 (Fri, 22 Jun 2007) #endif #define _XOPEN_SOURCE 600 +#include "config.h" #include <unistd.h> #include <stdio.h> #include <stdlib.h> diff --git a/lib/ext2fs/tdbtool.c b/lib/ext2fs/tdbtool.c index 130fc588..eeac0c87 100644 --- a/lib/ext2fs/tdbtool.c +++ b/lib/ext2fs/tdbtool.c @@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "config.h" #include <errno.h> #include <stdlib.h> #include <stdio.h> diff --git a/lib/ext2fs/test_io.c b/lib/ext2fs/test_io.c index 1a6d6c23..f67f6aeb 100644 --- a/lib/ext2fs/test_io.c +++ b/lib/ext2fs/test_io.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_badblocks.c b/lib/ext2fs/tst_badblocks.c index 717b95b9..3b39ef13 100644 --- a/lib/ext2fs/tst_badblocks.c +++ b/lib/ext2fs/tst_badblocks.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_bitops.c b/lib/ext2fs/tst_bitops.c index b64735cd..ed71447c 100644 --- a/lib/ext2fs/tst_bitops.c +++ b/lib/ext2fs/tst_bitops.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_byteswap.c b/lib/ext2fs/tst_byteswap.c index d0f2ee42..c500cae3 100644 --- a/lib/ext2fs/tst_byteswap.c +++ b/lib/ext2fs/tst_byteswap.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_getsectsize.c b/lib/ext2fs/tst_getsectsize.c index 5591b5d3..a6b234e0 100644 --- a/lib/ext2fs/tst_getsectsize.c +++ b/lib/ext2fs/tst_getsectsize.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_getsize.c b/lib/ext2fs/tst_getsize.c index 9a578fab..4ac2ea1f 100644 --- a/lib/ext2fs/tst_getsize.c +++ b/lib/ext2fs/tst_getsize.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_inode_size.c b/lib/ext2fs/tst_inode_size.c index 612459ab..86e3227e 100644 --- a/lib/ext2fs/tst_inode_size.c +++ b/lib/ext2fs/tst_inode_size.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/lib/ext2fs/tst_iscan.c b/lib/ext2fs/tst_iscan.c index 64246d37..6f783c38 100644 --- a/lib/ext2fs/tst_iscan.c +++ b/lib/ext2fs/tst_iscan.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/tst_super_size.c b/lib/ext2fs/tst_super_size.c index 8ef6a9d4..bbc25083 100644 --- a/lib/ext2fs/tst_super_size.c +++ b/lib/ext2fs/tst_super_size.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> diff --git a/lib/ext2fs/tst_types.c b/lib/ext2fs/tst_types.c index 5274984c..3e411288 100644 --- a/lib/ext2fs/tst_types.c +++ b/lib/ext2fs/tst_types.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c index df55abf3..56b0eeb5 100644 --- a/lib/ext2fs/undo_io.c +++ b/lib/ext2fs/undo_io.c @@ -14,6 +14,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c index 7eb32f4d..787990d7 100644 --- a/lib/ext2fs/unix_io.c +++ b/lib/ext2fs/unix_io.c @@ -21,6 +21,7 @@ #define _GNU_SOURCE #endif +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/unlink.c b/lib/ext2fs/unlink.c index 7ffeb9e8..d2d31cc4 100644 --- a/lib/ext2fs/unlink.c +++ b/lib/ext2fs/unlink.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #if HAVE_UNISTD_H diff --git a/lib/ext2fs/valid_blk.c b/lib/ext2fs/valid_blk.c index ec3edd88..9047f41f 100644 --- a/lib/ext2fs/valid_blk.c +++ b/lib/ext2fs/valid_blk.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/lib/ext2fs/version.c b/lib/ext2fs/version.c index ab406fea..f8c8acfc 100644 --- a/lib/ext2fs/version.c +++ b/lib/ext2fs/version.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #if HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/lib/ext2fs/write_bb_file.c b/lib/ext2fs/write_bb_file.c index 70bcf08e..58343408 100644 --- a/lib/ext2fs/write_bb_file.c +++ b/lib/ext2fs/write_bb_file.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include "ext2_fs.h" diff --git a/lib/fpopen.c b/lib/fpopen.c index 0df25e4e..60af2086 100644 --- a/lib/fpopen.c +++ b/lib/fpopen.c @@ -21,6 +21,7 @@ * USE OF THIS SOFTWARE. */ +#include "config.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/lib/quota/Makefile.in b/lib/quota/Makefile.in index 71a7b066..38583ac6 100644 --- a/lib/quota/Makefile.in +++ b/lib/quota/Makefile.in @@ -125,8 +125,10 @@ $(OBJS): # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -common.o: $(srcdir)/common.c $(srcdir)/common.h -mkquota.o: $(srcdir)/mkquota.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +common.o: $(srcdir)/common.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/common.h +mkquota.o: $(srcdir)/mkquota.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ @@ -134,27 +136,29 @@ mkquota.o: $(srcdir)/mkquota.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/quota.h $(srcdir)/quotaio.h \ $(srcdir)/dqblk_v2.h $(srcdir)/quotaio_tree.h $(srcdir)/quotaio_v2.h \ $(srcdir)/mkquota.h $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/common.h -quotaio.o: $(srcdir)/quotaio.c $(srcdir)/common.h $(srcdir)/quotaio.h \ +quotaio.o: $(srcdir)/quotaio.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/common.h $(srcdir)/quotaio.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/quota.h $(srcdir)/dqblk_v2.h $(srcdir)/quotaio_tree.h -quotaio_tree.o: $(srcdir)/quotaio_tree.c $(srcdir)/common.h \ - $(srcdir)/quotaio_tree.h $(srcdir)/quota.h $(srcdir)/quotaio.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ +quotaio_tree.o: $(srcdir)/quotaio_tree.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/common.h $(srcdir)/quotaio_tree.h \ + $(srcdir)/quota.h $(srcdir)/quotaio.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/dqblk_v2.h -quotaio_v2.o: $(srcdir)/quotaio_v2.c $(srcdir)/common.h \ - $(srcdir)/quotaio_v2.h $(srcdir)/quota.h $(srcdir)/dqblk_v2.h \ - $(srcdir)/quotaio_tree.h $(srcdir)/quotaio.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ - $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ - $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ - $(top_builddir)/lib/ext2fs/ext2_err.h \ +quotaio_v2.o: $(srcdir)/quotaio_v2.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/common.h $(srcdir)/quotaio_v2.h \ + $(srcdir)/quota.h $(srcdir)/dqblk_v2.h $(srcdir)/quotaio_tree.h \ + $(srcdir)/quotaio.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ + $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h -dict.o: $(srcdir)/../../e2fsck/dict.c $(srcdir)/../../e2fsck/dict.h +dict.o: $(srcdir)/../../e2fsck/dict.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/../../e2fsck/dict.h diff --git a/lib/quota/common.c b/lib/quota/common.c index 4538513b..6fd34b9b 100644 --- a/lib/quota/common.c +++ b/lib/quota/common.c @@ -6,6 +6,7 @@ * Jani Jaakkola <jjaakkol@cs.helsinki.fi> - syslog support */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c index cbc76f7e..4316243a 100644 --- a/lib/quota/mkquota.c +++ b/lib/quota/mkquota.c @@ -3,6 +3,7 @@ * * Aditya Kali <adityakali@google.com> */ +#include "config.h" #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/lib/quota/quotaio.c b/lib/quota/quotaio.c index 803bf12a..ac04f42c 100644 --- a/lib/quota/quotaio.c +++ b/lib/quota/quotaio.c @@ -5,6 +5,7 @@ * Aditya Kali <adityakali@google.com> - Ported to e2fsprogs */ +#include "config.h" #include <stdio.h> #include <errno.h> #include <string.h> diff --git a/lib/quota/quotaio_tree.c b/lib/quota/quotaio_tree.c index 48e58f6d..7aeac620 100644 --- a/lib/quota/quotaio_tree.c +++ b/lib/quota/quotaio_tree.c @@ -4,6 +4,7 @@ * Jan Kara <jack@suse.cz> - sponsored by SuSE CR */ +#include "config.h" #include <sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/lib/quota/quotaio_v2.c b/lib/quota/quotaio_v2.c index 31197452..3259816e 100644 --- a/lib/quota/quotaio_v2.c +++ b/lib/quota/quotaio_v2.c @@ -4,6 +4,7 @@ * Jan Kara <jack@suse.cz> - sponsored by SuSE CR */ +#include "config.h" #include <sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index 4a2bdb1b..19413cc2 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -31,11 +31,6 @@ TAGS=etags COMPILE_ET=../et/compile_et --build-tree MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds -# -I.. is so that ss/ss_err.h works -# -I$(srcdir)/.. is so that ss/ss.h works -# -I$(srcdir)/../et is so com_err.h works -XTRA_CFLAGS= -I$(srcdir)/../et - .c.o: $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< @@ -196,31 +191,42 @@ $(OBJS): subdirs # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -invocation.o: $(srcdir)/invocation.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +invocation.o: $(srcdir)/invocation.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ + $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h +help.o: $(srcdir)/help.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -help.o: $(srcdir)/help.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +execute_cmd.o: $(srcdir)/execute_cmd.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -execute_cmd.o: $(srcdir)/execute_cmd.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +listen.o: $(srcdir)/listen.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -listen.o: $(srcdir)/listen.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +parse.o: $(srcdir)/parse.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -parse.o: $(srcdir)/parse.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +error.o: $(srcdir)/error.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ + $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h +prompt.o: $(srcdir)/prompt.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -error.o: $(srcdir)/error.c $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/ss_internal.h $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h \ - $(top_srcdir)/lib/et/com_err.h -prompt.o: $(srcdir)/prompt.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +request_tbl.o: $(srcdir)/request_tbl.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -request_tbl.o: $(srcdir)/request_tbl.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +list_rqs.o: $(srcdir)/list_rqs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -list_rqs.o: $(srcdir)/list_rqs.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +pager.o: $(srcdir)/pager.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -pager.o: $(srcdir)/pager.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +requests.o: $(srcdir)/requests.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -requests.o: $(srcdir)/requests.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +data.o: $(srcdir)/data.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -data.o: $(srcdir)/data.c $(srcdir)/ss_internal.h $(srcdir)/ss.h \ +get_readline.o: $(srcdir)/get_readline.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/ss_internal.h $(srcdir)/ss.h \ $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h -get_readline.o: $(srcdir)/get_readline.c $(srcdir)/ss_internal.h \ - $(srcdir)/ss.h $(top_builddir)/lib/ss/ss_err.h \ - $(top_srcdir)/lib/et/com_err.h diff --git a/lib/ss/data.c b/lib/ss/data.c index 8f7cda59..80d1b295 100644 --- a/lib/ss/data.c +++ b/lib/ss/data.c @@ -12,6 +12,7 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> #include "ss_internal.h" diff --git a/lib/ss/error.c b/lib/ss/error.c index 9a4b5269..781ba82d 100644 --- a/lib/ss/error.c +++ b/lib/ss/error.c @@ -12,9 +12,10 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> -#include <com_err.h> +#include "et/com_err.h" #include "ss_internal.h" #include <stdarg.h> diff --git a/lib/ss/execute_cmd.c b/lib/ss/execute_cmd.c index bc2a2046..53c10c9c 100644 --- a/lib/ss/execute_cmd.c +++ b/lib/ss/execute_cmd.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAS_STDLIB_H #include <stdlib.h> #endif diff --git a/lib/ss/get_readline.c b/lib/ss/get_readline.c index 4421052d..8da85f12 100644 --- a/lib/ss/get_readline.c +++ b/lib/ss/get_readline.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAS_STDLIB_H #include <stdlib.h> #endif diff --git a/lib/ss/help.c b/lib/ss/help.c index c1a167d1..6a61e70a 100644 --- a/lib/ss/help.c +++ b/lib/ss/help.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/lib/ss/invocation.c b/lib/ss/invocation.c index 74fcb144..a7110500 100644 --- a/lib/ss/invocation.c +++ b/lib/ss/invocation.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAS_STDLIB_H #include <stdlib.h> #endif diff --git a/lib/ss/list_rqs.c b/lib/ss/list_rqs.c index 770f5f02..38e6aef0 100644 --- a/lib/ss/list_rqs.c +++ b/lib/ss/list_rqs.c @@ -10,6 +10,7 @@ * this software for any purpose. It is provided "as is" without * express or implied warranty. */ +#include "config.h" #include "ss_internal.h" #include <signal.h> #include <setjmp.h> diff --git a/lib/ss/listen.c b/lib/ss/listen.c index bd7c8c09..9578c3e8 100644 --- a/lib/ss/listen.c +++ b/lib/ss/listen.c @@ -16,6 +16,7 @@ * express or implied warranty. */ +#include "config.h" #include "ss_internal.h" #include <stdio.h> #include <setjmp.h> diff --git a/lib/ss/pager.c b/lib/ss/pager.c index 67fc1044..2b3a4665 100644 --- a/lib/ss/pager.c +++ b/lib/ss/pager.c @@ -14,6 +14,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/lib/ss/parse.c b/lib/ss/parse.c index 495030a2..b70ad165 100644 --- a/lib/ss/parse.c +++ b/lib/ss/parse.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAS_STDLIB_H #include <stdlib.h> #endif diff --git a/lib/ss/prompt.c b/lib/ss/prompt.c index 6fe42637..c56c2a09 100644 --- a/lib/ss/prompt.c +++ b/lib/ss/prompt.c @@ -16,6 +16,7 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> #include "ss_internal.h" diff --git a/lib/ss/request_tbl.c b/lib/ss/request_tbl.c index 4632d65d..b0b6f959 100644 --- a/lib/ss/request_tbl.c +++ b/lib/ss/request_tbl.c @@ -11,6 +11,7 @@ * express or implied warranty. */ +#include "config.h" #ifdef HAVE_ERRNO_H #include <errno.h> #endif diff --git a/lib/ss/requests.c b/lib/ss/requests.c index 2e061000..33ce5d20 100644 --- a/lib/ss/requests.c +++ b/lib/ss/requests.c @@ -13,6 +13,7 @@ * express or implied warranty. */ +#include "config.h" #include <stdio.h> #include "ss_internal.h" diff --git a/lib/ss/test_ss.c b/lib/ss/test_ss.c index 41d84ea7..53ca99fc 100644 --- a/lib/ss/test_ss.c +++ b/lib/ss/test_ss.c @@ -14,6 +14,7 @@ */ +#include "config.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/lib/uuid/clear.c b/lib/uuid/clear.c index 2d91fee9..436f8f78 100644 --- a/lib/uuid/clear.c +++ b/lib/uuid/clear.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include "string.h" #include "uuidP.h" diff --git a/lib/uuid/compare.c b/lib/uuid/compare.c index f28a7267..d5fc5037 100644 --- a/lib/uuid/compare.c +++ b/lib/uuid/compare.c @@ -34,6 +34,7 @@ * %End-Header% */ +#include "config.h" #include "uuidP.h" #include <string.h> diff --git a/lib/uuid/copy.c b/lib/uuid/copy.c index ead33aa2..32e6f502 100644 --- a/lib/uuid/copy.c +++ b/lib/uuid/copy.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include "uuidP.h" void uuid_copy(uuid_t dst, const uuid_t src) diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c index 420ca2b2..42d7563d 100644 --- a/lib/uuid/gen_uuid.c +++ b/lib/uuid/gen_uuid.c @@ -38,6 +38,8 @@ */ #define _SVID_SOURCE +#include "config.h" + #ifdef _WIN32 #define _WIN32_WINNT 0x0500 #include <windows.h> diff --git a/lib/uuid/gen_uuid_nt.c b/lib/uuid/gen_uuid_nt.c index aa44bfd3..79a40507 100644 --- a/lib/uuid/gen_uuid_nt.c +++ b/lib/uuid/gen_uuid_nt.c @@ -5,6 +5,7 @@ */ +#include "config.h" #include "uuidP.h" #pragma warning(push,4) diff --git a/lib/uuid/isnull.c b/lib/uuid/isnull.c index 931e7e7d..170c9a20 100644 --- a/lib/uuid/isnull.c +++ b/lib/uuid/isnull.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include "uuidP.h" /* Returns 1 if the uuid is the NULL uuid */ diff --git a/lib/uuid/pack.c b/lib/uuid/pack.c index 097516d2..3db21aef 100644 --- a/lib/uuid/pack.c +++ b/lib/uuid/pack.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include <string.h> #include "uuidP.h" diff --git a/lib/uuid/parse.c b/lib/uuid/parse.c index 074383ef..4c0857df 100644 --- a/lib/uuid/parse.c +++ b/lib/uuid/parse.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include <stdlib.h> #include <stdio.h> #include <ctype.h> diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c index 7ac0207e..5884ad92 100644 --- a/lib/uuid/tst_uuid.c +++ b/lib/uuid/tst_uuid.c @@ -32,6 +32,8 @@ * %End-Header% */ +#include "config.h" + #ifdef _WIN32 #define _WIN32_WINNT 0x0500 #include <windows.h> diff --git a/lib/uuid/unpack.c b/lib/uuid/unpack.c index beaaff3c..2c8043df 100644 --- a/lib/uuid/unpack.c +++ b/lib/uuid/unpack.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include <string.h> #include "uuidP.h" diff --git a/lib/uuid/unparse.c b/lib/uuid/unparse.c index a95bbb04..c556ae63 100644 --- a/lib/uuid/unparse.c +++ b/lib/uuid/unparse.c @@ -32,6 +32,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include "uuidP.h" diff --git a/lib/uuid/uuid_time.c b/lib/uuid/uuid_time.c index f25f5c90..4c3536b4 100644 --- a/lib/uuid/uuid_time.c +++ b/lib/uuid/uuid_time.c @@ -34,6 +34,8 @@ * %End-Header% */ +#include "config.h" + #ifdef _WIN32 #define _WIN32_WINNT 0x0500 #include <windows.h> diff --git a/misc/Makefile.in b/misc/Makefile.in index d7c4a5e8..cb3c6d9e 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -75,8 +75,6 @@ PROFILED_FILEFRAG_OBJS= profiled/filefrag.o PROFILED_E2UNDO_OBJS= profiled/e2undo.o PROFILED_E4DEFRAG_OBJS= profiled/e4defrag.o -XTRA_CFLAGS= -I$(srcdir)/../e2fsck -I. - SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \ $(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \ $(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \ @@ -119,6 +117,10 @@ prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et $(E) " COMPILE_ET prof_err.et" $(Q) $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et +profile.h: $(top_srcdir)/e2fsck/profile.h + $(E) " CP $<" + $(Q) cp $< $@ + default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk $(E) " PROFILE_TO_C mke2fs.conf" $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ @@ -551,7 +553,7 @@ uninstall: clean: $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \ - $(FMANPAGES) \ + $(FMANPAGES) profile.h \ base_device base_device.out mke2fs.static filefrag e2freefrag \ e2initrd_helper partinfo prof_err.[ch] default_profile.c \ uuidd e2image tune2fs.static tst_ismounted fsck.profiled \ @@ -570,7 +572,8 @@ distclean: clean # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +tune2fs.o: $(srcdir)/tune2fs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ @@ -578,26 +581,34 @@ tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/util.h \ - $(top_srcdir)/version.h $(srcdir)/nls-enable.h -mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(top_srcdir)/lib/quota/mkquota.h $(top_srcdir)/lib/quota/quota.h \ + $(top_srcdir)/lib/../e2fsck/dict.h $(top_srcdir)/version.h \ + $(srcdir)/nls-enable.h +mklost+found.o: $(srcdir)/mklost+found.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h -mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +mke2fs.o: $(srcdir)/mke2fs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fsP.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ - $(srcdir)/util.h $(srcdir)/../e2fsck/profile.h prof_err.h \ - $(top_srcdir)/version.h $(srcdir)/nls-enable.h -chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ + $(srcdir)/util.h profile.h prof_err.h $(top_srcdir)/version.h \ + $(srcdir)/nls-enable.h $(top_srcdir)/lib/quota/mkquota.h \ + $(top_srcdir)/lib/quota/quota.h $(top_srcdir)/lib/../e2fsck/dict.h +chattr.o: $(srcdir)/chattr.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h -lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +lsattr.o: $(srcdir)/lsattr.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h -dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ @@ -606,44 +617,56 @@ dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/version.h \ $(srcdir)/nls-enable.h -badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \ +badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/nls-enable.h -fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \ - $(srcdir)/fsck.h -util.o: $(srcdir)/util.c $(top_srcdir)/lib/et/com_err.h \ +fsck.o: $(srcdir)/fsck.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/version.h \ + $(srcdir)/nls-enable.h $(srcdir)/fsck.h +util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/nls-enable.h $(srcdir)/util.h -uuidgen.o: $(srcdir)/uuidgen.c $(srcdir)/nls-enable.h -blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/ext2fs/ext2fs.h \ +uuidgen.o: $(srcdir)/uuidgen.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/nls-enable.h +blkid.o: $(srcdir)/blkid.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h -logsave.o: $(srcdir)/logsave.c -filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/ext2fs/ext2_types.h \ +logsave.o: $(srcdir)/logsave.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h +filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/fiemap.h -base_device.o: $(srcdir)/base_device.c $(srcdir)/fsck.h -ismounted.o: $(srcdir)/ismounted.c $(srcdir)/fsck.h \ +base_device.o: $(srcdir)/base_device.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/fsck.h +ismounted.o: $(srcdir)/ismounted.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/fsck.h \ $(top_srcdir)/lib/et/com_err.h -profile.o: $(srcdir)/../e2fsck/profile.c $(top_srcdir)/lib/et/com_err.h \ +profile.o: $(srcdir)/../e2fsck/profile.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/../e2fsck/profile.h prof_err.h -e2undo.o: $(srcdir)/e2undo.c $(top_srcdir)/lib/ext2fs/tdb.h \ +e2undo.o: $(srcdir)/e2undo.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/tdb.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(srcdir)/nls-enable.h -e2freefrag.o: $(srcdir)/e2freefrag.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \ +e2freefrag.o: $(srcdir)/e2freefrag.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ diff --git a/misc/badblocks.c b/misc/badblocks.c index 1e7e1c84..168d93e6 100644 --- a/misc/badblocks.c +++ b/misc/badblocks.c @@ -37,6 +37,7 @@ #define O_LARGEFILE 0 #endif +#include "config.h" #include <errno.h> #include <fcntl.h> #ifdef HAVE_GETOPT_H diff --git a/misc/base_device.c b/misc/base_device.c index aad2ba05..b2ce1380 100644 --- a/misc/base_device.c +++ b/misc/base_device.c @@ -18,6 +18,7 @@ * License. * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/misc/blkid.c b/misc/blkid.c index 388abad0..a4a8db0b 100644 --- a/misc/blkid.c +++ b/misc/blkid.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/misc/chattr.c b/misc/chattr.c index de33b083..69aaed1c 100644 --- a/misc/chattr.c +++ b/misc/chattr.c @@ -20,6 +20,7 @@ #define _LARGEFILE64_SOURCE +#include "config.h" #include <sys/types.h> #include <dirent.h> #include <fcntl.h> diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index 4d2d5c7d..df241c21 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -20,6 +20,7 @@ * 94/02/27 - Ported to use the ext2fs library */ +#include "config.h" #ifdef HAVE_GETOPT_H #include <getopt.h> #else diff --git a/misc/e2freefrag.c b/misc/e2freefrag.c index 419c6fc2..b442f324 100644 --- a/misc/e2freefrag.c +++ b/misc/e2freefrag.c @@ -11,6 +11,7 @@ * License version 2. * %End-Header% */ +#include "config.h" #include <stdio.h> #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/misc/e2image.c b/misc/e2image.c index f6e06d23..4cd834af 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -13,6 +13,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <fcntl.h> #include <grp.h> #ifdef HAVE_GETOPT_H diff --git a/misc/e2initrd_helper.c b/misc/e2initrd_helper.c index 3d9f5ab5..c98a07a2 100644 --- a/misc/e2initrd_helper.c +++ b/misc/e2initrd_helper.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <unistd.h> #ifdef HAVE_STDLIB_H diff --git a/misc/e2label.c b/misc/e2label.c index e96101ae..bc87a428 100644 --- a/misc/e2label.c +++ b/misc/e2label.c @@ -11,6 +11,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <string.h> #include <fcntl.h> diff --git a/misc/e2undo.c b/misc/e2undo.c index 04d0b170..c968f912 100644 --- a/misc/e2undo.c +++ b/misc/e2undo.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #ifdef HAVE_GETOPT_H diff --git a/misc/e4defrag.c b/misc/e4defrag.c index cdf4ffb0..6491edd6 100644 --- a/misc/e4defrag.c +++ b/misc/e4defrag.c @@ -19,6 +19,7 @@ #define _GNU_SOURCE #endif +#include "config.h" #include <ctype.h> #include <dirent.h> #include <endian.h> diff --git a/misc/filefrag.c b/misc/filefrag.c index b055c2bf..84417574 100644 --- a/misc/filefrag.c +++ b/misc/filefrag.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #ifndef __linux__ #include <stdio.h> #include <stdlib.h> diff --git a/misc/findsuper.c b/misc/findsuper.c index e793e3b1..e3baf2e0 100644 --- a/misc/findsuper.c +++ b/misc/findsuper.c @@ -83,6 +83,7 @@ #define _FILE_OFFSET_BITS 64 +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/misc/fsck.c b/misc/fsck.c index 93452333..9700f18c 100644 --- a/misc/fsck.c +++ b/misc/fsck.c @@ -27,6 +27,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */ +#include "config.h" #include <sys/types.h> #include <sys/wait.h> #include <sys/signal.h> diff --git a/misc/ismounted.c b/misc/ismounted.c index 50b41407..9e8bebfd 100644 --- a/misc/ismounted.c +++ b/misc/ismounted.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #if HAVE_UNISTD_H #include <unistd.h> diff --git a/misc/logsave.c b/misc/logsave.c index 17457a5f..c37473cb 100644 --- a/misc/logsave.c +++ b/misc/logsave.c @@ -12,6 +12,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/misc/lsattr.c b/misc/lsattr.c index 15b17ad1..1f55db31 100644 --- a/misc/lsattr.c +++ b/misc/lsattr.c @@ -19,6 +19,7 @@ #define _LARGEFILE64_SOURCE +#include "config.h" #include <sys/types.h> #include <dirent.h> #ifdef HAVE_ERRNO_H diff --git a/misc/mke2fs.c b/misc/mke2fs.c index df694461..1280b3b3 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -18,6 +18,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of PATH_MAX in Solaris */ +#include "config.h" #include <stdio.h> #include <string.h> #include <strings.h> diff --git a/misc/mklost+found.c b/misc/mklost+found.c index 8d5fa7be..4f78bdec 100644 --- a/misc/mklost+found.c +++ b/misc/mklost+found.c @@ -13,6 +13,7 @@ * 93/04/22 - Creation */ +#include "config.h" #include <errno.h> #include <fcntl.h> #include <stdio.h> diff --git a/misc/partinfo.c b/misc/partinfo.c index 48b395f6..49660744 100644 --- a/misc/partinfo.c +++ b/misc/partinfo.c @@ -7,6 +7,7 @@ * */ +#include "config.h" #include <sys/types.h> #include <fcntl.h> #ifdef HAVE_SYS_IOCTL_H diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 346e2d17..11ef0958 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -27,6 +27,7 @@ #define _XOPEN_SOURCE 600 /* for inclusion of strptime() */ #define _BSD_SOURCE /* for inclusion of strcasecmp() */ +#include "config.h" #include <fcntl.h> #include <grp.h> #ifdef HAVE_GETOPT_H diff --git a/misc/util.c b/misc/util.c index babdcf9f..4564b4e6 100644 --- a/misc/util.c +++ b/misc/util.c @@ -12,6 +12,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #include <stdio.h> #include <string.h> #ifdef HAVE_ERRNO_H diff --git a/misc/uuidd.c b/misc/uuidd.c index 912773a1..37e031a5 100644 --- a/misc/uuidd.c +++ b/misc/uuidd.c @@ -11,6 +11,7 @@ #define _GNU_SOURCE /* for setres[ug]id() */ +#include "config.h" #include <stdio.h> #ifdef HAVE_STDLIB_H #include <stdlib.h> diff --git a/misc/uuidgen.c b/misc/uuidgen.c index 7385a5c4..f181d193 100644 --- a/misc/uuidgen.c +++ b/misc/uuidgen.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #ifdef HAVE_STDLIB_H #include <stdlib.h> diff --git a/resize/extent.c b/resize/extent.c index 94eb689c..8f206e97 100644 --- a/resize/extent.c +++ b/resize/extent.c @@ -16,6 +16,7 @@ * %End-Header% */ +#include "config.h" #include "resize2fs.h" struct ext2_extent_entry { diff --git a/resize/main.c b/resize/main.c index daa68c5b..659a9234 100644 --- a/resize/main.c +++ b/resize/main.c @@ -15,6 +15,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include "config.h" #ifdef HAVE_GETOPT_H #include <getopt.h> #else diff --git a/resize/online.c b/resize/online.c index 8bb7e9e4..e1d05b77 100644 --- a/resize/online.c +++ b/resize/online.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include "resize2fs.h" #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 59beb357..3c167664 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -33,6 +33,7 @@ * 5. Move the inode tables, if necessary. */ +#include "config.h" #include "resize2fs.h" #include <time.h> diff --git a/resize/sim_progress.c b/resize/sim_progress.c index e7dba88e..d4206ba2 100644 --- a/resize/sim_progress.c +++ b/resize/sim_progress.c @@ -12,6 +12,7 @@ * %End-Header% */ +#include "config.h" #include "resize2fs.h" struct ext2_sim_progress { diff --git a/resize/test_extent.c b/resize/test_extent.c index a8678f1f..fa3f5052 100644 --- a/resize/test_extent.c +++ b/resize/test_extent.c @@ -12,6 +12,7 @@ * %End-Header% */ +#include "config.h" #include "resize2fs.h" void do_test(FILE *in, FILE *out); diff --git a/tests/progs/hold_inode.c b/tests/progs/hold_inode.c index debf4a4e..792aa71d 100644 --- a/tests/progs/hold_inode.c +++ b/tests/progs/hold_inode.c @@ -10,6 +10,7 @@ * %End-Header% */ +#include "config.h" #include <unistd.h> #include <stdio.h> #include <dirent.h> diff --git a/tests/progs/random_exercise.c b/tests/progs/random_exercise.c index 0be389fb..38217ab5 100644 --- a/tests/progs/random_exercise.c +++ b/tests/progs/random_exercise.c @@ -13,6 +13,7 @@ * %End-Header% */ +#include "config.h" #include <unistd.h> #include <stdio.h> #include <sys/types.h> diff --git a/tests/progs/test_icount.c b/tests/progs/test_icount.c index 017cc4d8..d028a601 100644 --- a/tests/progs/test_icount.c +++ b/tests/progs/test_icount.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/tests/progs/test_rel.c b/tests/progs/test_rel.c index 954a7221..8f7280c7 100644 --- a/tests/progs/test_rel.c +++ b/tests/progs/test_rel.c @@ -9,6 +9,7 @@ * %End-Header% */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/util/subst.conf.in b/util/subst.conf.in index d5707250..0e074d85 100644 --- a/util/subst.conf.in +++ b/util/subst.conf.in @@ -12,6 +12,7 @@ SIZEOF_SHORT @SIZEOF_SHORT@ datarootdir @datarootdir@ datadir @datadir@ root_sysconfdir @root_sysconfdir@ +$datarootdir @datarootdir@ $root_prefix @root_prefix@ $prefix @prefix@ # Enable the documentation for the journal device mke2fs, tune2fs, and |