mirror of https://github.com/vitalif/e2fsprogs
ChangeLog, Makefile.in, configure.in, MCONFIG.in, configure, wordwrap.pl:
Makefile.in (depend): Make "make depend" at the top-level automatically recurse through all subdirectories. configure.in: Test for perl since it's needed by wordwrap.pl MCONFIG.in (depend): Fix make-depend so that it the dependencies are automatically word-wrapped. Added the makefile macro $(PERL). wordwrap.pl: New file which does the word wrapping.bitmap-optimize
Theodore Ts'o
parent
c54b3c3c99
commit
9d564f73f5
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
1999-07-03 <tytso@valinux.com>
|
||||
|
||||
* Makefile.in (depend): Make "make depend" at the top-level
|
||||
automatically recurse through all subdirectories.
|
||||
|
||||
* configure.in: Test for perl since it's needed by wordwrap.pl
|
||||
|
||||
* MCONFIG.in (depend): Fix make-depend so that it the dependencies
|
||||
are automatically word-wrapped. Added the makefile macro
|
||||
$(PERL).
|
||||
|
||||
* wordwrap.pl: New file which does the word wrapping.
|
||||
|
||||
1999-07-03 <tytso@valinux.com>
|
||||
|
||||
* MCONFIG.in (subst): Add rule to build the util/subst program if
|
||||
|
|
|
|||
17
MCONFIG.in
17
MCONFIG.in
|
|
@ -41,6 +41,7 @@ CHMOD = @CHMOD@
|
|||
AR = @AR@
|
||||
AWK = @AWK@
|
||||
SED = @SED@
|
||||
PERL = @PERL@
|
||||
RANLIB = @RANLIB@
|
||||
STRIP = @STRIP@
|
||||
LD = $(PURE) @CC@
|
||||
|
|
@ -155,15 +156,16 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in
|
|||
# Make depend magic...
|
||||
#
|
||||
|
||||
.depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed
|
||||
.depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed $(top_srcdir)/wordwrap.pl
|
||||
if test -n "$(SRCS)" ; then \
|
||||
$(CC) -M $(ALL_CFLAGS) $(SRCS) | \
|
||||
sed -f $(top_srcdir)/depfix.sed \
|
||||
$(SED) -f $(top_srcdir)/depfix.sed \
|
||||
-e 's; $(srcdir)/; $$(srcdir)/;g' \
|
||||
-e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \
|
||||
-e 's; $(top_builddir)/; $$(top_builddir)/;g' \
|
||||
-e 's; \./; ;g' \
|
||||
-e '/^ *\\$$/d' > .depend; \
|
||||
-e '/^ *\\$$/d' | \
|
||||
$(PERL) $(top_srcdir)/wordwrap.pl > .depend; \
|
||||
else :; fi
|
||||
|
||||
depend:: .depend
|
||||
|
|
@ -171,8 +173,11 @@ depend:: .depend
|
|||
sed -e '/^# +++ Dependency line eater +++/,$$d' \
|
||||
< $(srcdir)/Makefile.in | cat - .depend \
|
||||
> $(srcdir)/Makefile.in.new; \
|
||||
$(MV) $(srcdir)/Makefile.in $(srcdir)/Makefile.in.old; \
|
||||
$(MV) $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in; \
|
||||
else :; fi
|
||||
if cmp -s $(srcdir)/Makefile.in $(srcdir)/Makefile.in.new ; then \
|
||||
$(RM) $(srcdir)/Makefile.in.new ; \
|
||||
else \
|
||||
$(MV) $(srcdir)/Makefile.in $(srcdir)/Makefile.in.old; \
|
||||
$(MV) $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in; \
|
||||
fi ; else :; fi
|
||||
|
||||
# End of file MCONFIG
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ install-libs: install-libs-recursive
|
|||
|
||||
uninstall-libs: uninstall-libs-recursive
|
||||
|
||||
TAGS clean-recursive distclean-recursive \
|
||||
TAGS clean-recursive distclean-recursive depend-recursive \
|
||||
mostlyclean-recursive realclean-recursive install-recursive:
|
||||
for subdir in $(SUBDIRS); do \
|
||||
if test -d $$subdir ; then \
|
||||
|
|
@ -76,6 +76,8 @@ distclean: distclean-recursive distclean-local
|
|||
|
||||
realclean: realclean-recursive realclean-local
|
||||
|
||||
depend:: depend-recursive
|
||||
|
||||
include/asm/types.h: $(DEP_SUBSTITUTE) $(srcdir)/include/asm/types.h.in
|
||||
$(SUBSTITUTE) $(srcdir)/include/asm/types.h.in \
|
||||
> include/asm/types.h
|
||||
|
|
|
|||
|
|
@ -1200,8 +1200,44 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
# Extract the first word of "perl", so it can be a program name with args.
|
||||
set dummy perl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1207: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
case "$PERL" in
|
||||
/*)
|
||||
ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_path_PERL="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PERL="$ac_cv_path_PERL"
|
||||
if test -n "$PERL"; then
|
||||
echo "$ac_t""$PERL" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:1205: checking build system type" >&5
|
||||
echo "configure:1241: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -1227,7 +1263,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1231: checking for $ac_word" >&5
|
||||
echo "configure:1267: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1259,7 +1295,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1263: checking for $ac_word" >&5
|
||||
echo "configure:1299: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1294,7 +1330,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1298: checking for $ac_word" >&5
|
||||
echo "configure:1334: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1326,7 +1362,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1330: checking for $ac_word" >&5
|
||||
echo "configure:1366: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1361,7 +1397,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1365: checking for $ac_word" >&5
|
||||
echo "configure:1401: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1393,7 +1429,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "strip", so it can be a program name with args.
|
||||
set dummy strip; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1397: checking for $ac_word" >&5
|
||||
echo "configure:1433: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1428,7 +1464,7 @@ fi
|
|||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1432: checking for $ac_word" >&5
|
||||
echo "configure:1468: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1458,7 +1494,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1462: checking for $ac_word" >&5
|
||||
echo "configure:1498: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1509,7 +1545,7 @@ fi
|
|||
# Extract the first word of "cl", so it can be a program name with args.
|
||||
set dummy cl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1513: checking for $ac_word" >&5
|
||||
echo "configure:1549: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1541,7 +1577,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1545: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1581: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1552,12 +1588,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1556 "configure"
|
||||
#line 1592 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1583,12 +1619,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1587: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1623: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:1592: checking whether we are using GNU C" >&5
|
||||
echo "configure:1628: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1597,7 +1633,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -1616,7 +1652,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1620: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1656: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1659,7 +1695,7 @@ fi
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:1663: checking for a BSD compatible install" >&5
|
||||
echo "configure:1699: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1713,7 +1749,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|||
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1717: checking how to run the C preprocessor" >&5
|
||||
echo "configure:1753: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -1728,13 +1764,13 @@ else
|
|||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1732 "configure"
|
||||
#line 1768 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1745,13 +1781,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1749 "configure"
|
||||
#line 1785 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1762,13 +1798,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1766 "configure"
|
||||
#line 1802 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1796,17 +1832,17 @@ for ac_hdr in stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h diren
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1800: checking for $ac_hdr" >&5
|
||||
echo "configure:1836: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1805 "configure"
|
||||
#line 1841 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1833,12 +1869,12 @@ fi
|
|||
done
|
||||
|
||||
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
|
||||
echo "configure:1837: checking for vprintf" >&5
|
||||
echo "configure:1873: checking for vprintf" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1842 "configure"
|
||||
#line 1878 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char vprintf(); below. */
|
||||
|
|
@ -1861,7 +1897,7 @@ vprintf();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_vprintf=yes"
|
||||
else
|
||||
|
|
@ -1885,12 +1921,12 @@ fi
|
|||
|
||||
if test "$ac_cv_func_vprintf" != yes; then
|
||||
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
|
||||
echo "configure:1889: checking for _doprnt" >&5
|
||||
echo "configure:1925: checking for _doprnt" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1894 "configure"
|
||||
#line 1930 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char _doprnt(); below. */
|
||||
|
|
@ -1913,7 +1949,7 @@ _doprnt();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func__doprnt=yes"
|
||||
else
|
||||
|
|
@ -1938,12 +1974,12 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether struct dirent has a d_namlen field""... $ac_c" 1>&6
|
||||
echo "configure:1942: checking whether struct dirent has a d_namlen field" >&5
|
||||
echo "configure:1978: checking whether struct dirent has a d_namlen field" >&5
|
||||
if eval "test \"`echo '$''{'e2fsprogs_cv_struct_d_namlen'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1947 "configure"
|
||||
#line 1983 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
|
|
@ -1951,7 +1987,7 @@ int main() {
|
|||
struct dirent de; de.d_namlen = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
e2fsprogs_cv_struct_d_namlen=yes
|
||||
else
|
||||
|
|
@ -1971,19 +2007,19 @@ EOF
|
|||
|
||||
fi
|
||||
echo $ac_n "checking whether llseek declared in unistd.h""... $ac_c" 1>&6
|
||||
echo "configure:1975: checking whether llseek declared in unistd.h" >&5
|
||||
echo "configure:2011: checking whether llseek declared in unistd.h" >&5
|
||||
if eval "test \"`echo '$''{'e2fsprogs_cv_have_llseek_prototype'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1980 "configure"
|
||||
#line 2016 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <unistd.h>
|
||||
int main() {
|
||||
extern int llseek(int);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
e2fsprogs_cv_have_llseek_prototype=no
|
||||
else
|
||||
|
|
@ -2011,7 +2047,7 @@ if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
|
|||
echo "configure: warning: Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4" 1>&2
|
||||
fi
|
||||
echo $ac_n "checking size of short""... $ac_c" 1>&6
|
||||
echo "configure:2015: checking size of short" >&5
|
||||
echo "configure:2051: checking size of short" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2019,7 +2055,7 @@ else
|
|||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2023 "configure"
|
||||
#line 2059 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
main()
|
||||
|
|
@ -2030,7 +2066,7 @@ main()
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_sizeof_short=`cat conftestval`
|
||||
else
|
||||
|
|
@ -2050,7 +2086,7 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking size of int""... $ac_c" 1>&6
|
||||
echo "configure:2054: checking size of int" >&5
|
||||
echo "configure:2090: checking size of int" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2058,7 +2094,7 @@ else
|
|||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2062 "configure"
|
||||
#line 2098 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
main()
|
||||
|
|
@ -2069,7 +2105,7 @@ main()
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_sizeof_int=`cat conftestval`
|
||||
else
|
||||
|
|
@ -2089,7 +2125,7 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking size of long""... $ac_c" 1>&6
|
||||
echo "configure:2093: checking size of long" >&5
|
||||
echo "configure:2129: checking size of long" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2097,7 +2133,7 @@ else
|
|||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2101 "configure"
|
||||
#line 2137 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
main()
|
||||
|
|
@ -2108,7 +2144,7 @@ main()
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_sizeof_long=`cat conftestval`
|
||||
else
|
||||
|
|
@ -2128,7 +2164,7 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking size of long long""... $ac_c" 1>&6
|
||||
echo "configure:2132: checking size of long long" >&5
|
||||
echo "configure:2168: checking size of long long" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2136,7 +2172,7 @@ else
|
|||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2140 "configure"
|
||||
#line 2176 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
main()
|
||||
|
|
@ -2147,7 +2183,7 @@ main()
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_sizeof_long_long=`cat conftestval`
|
||||
else
|
||||
|
|
@ -2175,19 +2211,19 @@ SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
|
|||
|
||||
|
||||
echo $ac_n "checking whether struct stat has a st_flags field""... $ac_c" 1>&6
|
||||
echo "configure:2179: checking whether struct stat has a st_flags field" >&5
|
||||
echo "configure:2215: checking whether struct stat has a st_flags field" >&5
|
||||
if eval "test \"`echo '$''{'e2fsprogs_cv_struct_st_flags'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2184 "configure"
|
||||
#line 2220 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/stat.h>
|
||||
int main() {
|
||||
struct stat stat; stat.st_flags = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
e2fsprogs_cv_struct_st_flags=yes
|
||||
else
|
||||
|
|
@ -2209,12 +2245,12 @@ fi
|
|||
for ac_func in chflags getrusage llseek strdup getmntinfo strcasecmp srandom fchown mallinfo
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:2213: checking for $ac_func" >&5
|
||||
echo "configure:2249: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2218 "configure"
|
||||
#line 2254 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -2237,7 +2273,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -2262,19 +2298,19 @@ fi
|
|||
done
|
||||
|
||||
echo $ac_n "checking ino_t defined by sys/types.h""... $ac_c" 1>&6
|
||||
echo "configure:2266: checking ino_t defined by sys/types.h" >&5
|
||||
echo "configure:2302: checking ino_t defined by sys/types.h" >&5
|
||||
if eval "test \"`echo '$''{'e2fsprogs_cv_ino_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2271 "configure"
|
||||
#line 2307 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
int main() {
|
||||
ino_t ino; ino = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
e2fsprogs_cv_ino_t=yes
|
||||
else
|
||||
|
|
@ -2295,17 +2331,17 @@ EOF
|
|||
fi
|
||||
ac_safe=`echo "linux/fs.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for linux/fs.h""... $ac_c" 1>&6
|
||||
echo "configure:2299: checking for linux/fs.h" >&5
|
||||
echo "configure:2335: checking for linux/fs.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2304 "configure"
|
||||
#line 2340 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <linux/fs.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2340,7 +2376,7 @@ fi
|
|||
|
||||
SOCKET_LIB=''
|
||||
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:2344: checking for socket in -lsocket" >&5
|
||||
echo "configure:2380: checking for socket in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2348,7 +2384,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2352 "configure"
|
||||
#line 2388 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2359,7 +2395,7 @@ int main() {
|
|||
socket()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2381,12 +2417,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for optreset""... $ac_c" 1>&6
|
||||
echo "configure:2385: checking for optreset" >&5
|
||||
echo "configure:2421: checking for optreset" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_have_optreset'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2390 "configure"
|
||||
#line 2426 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <unistd.h>
|
||||
EOF
|
||||
|
|
@ -2409,12 +2445,12 @@ EOF
|
|||
|
||||
fi
|
||||
echo $ac_n "checking whether the ext2 ioctls compile""... $ac_c" 1>&6
|
||||
echo "configure:2413: checking whether the ext2 ioctls compile" >&5
|
||||
echo "configure:2449: checking whether the ext2 ioctls compile" >&5
|
||||
if eval "test \"`echo '$''{'e2fsprogs_cv_ioctl_ext2'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2418 "configure"
|
||||
#line 2454 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <linux/ext2_fs.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
|
@ -2422,7 +2458,7 @@ int main() {
|
|||
ioctl (0, EXT2_IOC_SETVERSION, 0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
e2fsprogs_cv_ioctl_ext2=yes
|
||||
else
|
||||
|
|
@ -2442,19 +2478,19 @@ EOF
|
|||
|
||||
fi
|
||||
echo $ac_n "checking whether struct ext2_inode has an i_version field""... $ac_c" 1>&6
|
||||
echo "configure:2446: checking whether struct ext2_inode has an i_version field" >&5
|
||||
echo "configure:2482: checking whether struct ext2_inode has an i_version field" >&5
|
||||
if eval "test \"`echo '$''{'e2fsprogs_cv_ext2_inode_version'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2451 "configure"
|
||||
#line 2487 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <linux/ext2_fs.h>
|
||||
int main() {
|
||||
struct ext2_inode e2i; e2i.i_version=0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
e2fsprogs_cv_ext2_inode_version=yes
|
||||
else
|
||||
|
|
@ -2498,20 +2534,20 @@ if test "$root_prefix" = NONE ; then
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6
|
||||
echo "configure:2502: checking whether linker accepts -static" >&5
|
||||
echo "configure:2538: checking whether linker accepts -static" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_e2fsprogs_use_static'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2508 "configure"
|
||||
#line 2544 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
fflush(stdout);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_e2fsprogs_use_static=yes
|
||||
else
|
||||
|
|
@ -2750,6 +2786,7 @@ s%@RM@%$RM%g
|
|||
s%@CHMOD@%$CHMOD%g
|
||||
s%@AWK@%$AWK%g
|
||||
s%@SED@%$SED%g
|
||||
s%@PERL@%$PERL%g
|
||||
s%@build@%$build%g
|
||||
s%@build_alias@%$build_alias%g
|
||||
s%@build_cpu@%$build_cpu%g
|
||||
|
|
|
|||
|
|
@ -312,6 +312,7 @@ AC_PATH_PROG(RM, rm, rm)
|
|||
AC_PATH_PROG(CHMOD, chmod, :)
|
||||
AC_PATH_PROG(AWK, awk, awk)
|
||||
AC_PATH_PROG(SED, sed, sed)
|
||||
AC_PATH_PROG(PERL, perl, perl)
|
||||
AC_CHECK_TOOL(AR, ar, ar)
|
||||
AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
AC_CHECK_TOOL(STRIP, strip, :)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
#!/usr/bin/perl
|
||||
#
|
||||
# wordwrap.pl --- does word wrap
|
||||
#
|
||||
while (<>) {
|
||||
if (/^#/) { # don't word wrap comments
|
||||
print;
|
||||
next;
|
||||
}
|
||||
next if (/^$/); # skip blank lines
|
||||
$linelen = 0;
|
||||
split;
|
||||
while (defined($word = shift @_)) {
|
||||
if ($linelen > 0) {
|
||||
printf(" ");
|
||||
}
|
||||
$len = length($word) + 1;
|
||||
$linelen += $len;
|
||||
if ($linelen > 78) {
|
||||
printf("\\\n ");
|
||||
$linelen = 1+$len;
|
||||
}
|
||||
printf("%s", $word);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
Loading…
Reference in New Issue