From e4a8bde40a6d8319d1b28e054e1a419ba3df2363 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Mon, 18 Jun 2001 10:58:27 +0000 Subject: [PATCH] Check for the e2fsprogs header instead of the kernel header if available. --- CHANGES | 7 ++- common/dumprmt.c | 15 +++-- config.h.in | 7 ++- configure | 129 +++++++++++++++++++++++++++++------------- configure.in | 15 ++++- dump/itime.c | 6 +- dump/main.c | 6 +- dump/optr.c | 6 +- dump/tape.c | 7 ++- dump/traverse.c | 6 +- dump/unctime.c | 6 +- restore/dirs.c | 6 +- restore/interactive.c | 6 +- restore/restore.c | 6 +- restore/symtab.c | 6 +- restore/tape.c | 6 +- restore/utilities.c | 6 +- 17 files changed, 182 insertions(+), 64 deletions(-) diff --git a/CHANGES b/CHANGES index 6282580..494017f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.116 2001/05/26 11:11:16 stelian Exp $ +$Id: CHANGES,v 1.117 2001/06/18 10:58:27 stelian Exp $ Changes between versions 0.4b22 and 0.4b23 (released ????????????) ================================================================== @@ -9,6 +9,11 @@ Changes between versions 0.4b22 and 0.4b23 (released ????????????) 2. Implement the Sun rmt extended protocol. Patch submitted by Ian Gordon . +3. Check for the e2fsprogs header instead of + the linux kernel header. This ensures that dump always has the + latest version of this file. Patch submitted by + Andreas Dilger . + Changes between versions 0.4b21 and 0.4b22 (released May 12, 2001) ================================================================== diff --git a/common/dumprmt.c b/common/dumprmt.c index 503b933..12d60fc 100644 --- a/common/dumprmt.c +++ b/common/dumprmt.c @@ -41,31 +41,30 @@ #ifndef lint static const char rcsid[] = - "$Id: dumprmt.c,v 1.16 2001/02/22 10:57:39 stelian Exp $"; + "$Id: dumprmt.c,v 1.17 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include -#ifdef __linux__ -#include -#include -#endif #include #include #include #include #ifdef __linux__ +#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include -#else -#ifdef sunos +#elif defined sunos #include #include #else #include #endif -#endif #include #include diff --git a/config.h.in b/config.h.in index b483fce..c64ec5d 100644 --- a/config.h.in +++ b/config.h.in @@ -45,7 +45,12 @@ /* Define if you want to include readline support. */ #undef HAVE_READLINE -/* Define if we have the ext2_ino_t type (from e2fsprogs 1.20+). */ +/* Define if you have installed (from e2fsprogs 1.20+). + * Otherwise, we will use the (usually older) header. + */ +#undef HAVE_EXT2FS_EXT2_FS_H + +/* Define if we have the ext2_ino_t type (from e2fsprogs 1.20+). */ #undef HAVE_EXT2_INO_T /* Define if we have the s_journal_inum field in struct ext2_super_block. */ diff --git a/configure b/configure index 958ddc7..d0a7ab0 100755 --- a/configure +++ b/configure @@ -1735,19 +1735,64 @@ if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then { echo "configure: error: You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs" 1>&2; exit 1; } fi +for ac_hdr in ext2fs/ext2_fs.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1743: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1753: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + echo $ac_n "checking for ext2_ino_t type in libext2fs headers""... $ac_c" 1>&6 -echo "configure:1740: checking for ext2_ino_t type in libext2fs headers" >&5 +echo "configure:1781: checking for ext2_ino_t type in libext2fs headers" >&5 cat > conftest.$ac_ext < +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include int main() { ext2_ino_t ino = 0; ; return 0; } EOF -if { (eval echo configure:1751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_EXT2_INO_T 1 @@ -1762,18 +1807,22 @@ fi rm -f conftest* echo $ac_n "checking for s_journal_inum field in ext2_super_block struct""... $ac_c" 1>&6 -echo "configure:1766: checking for s_journal_inum field in ext2_super_block struct" >&5 +echo "configure:1811: checking for s_journal_inum field in ext2_super_block struct" >&5 cat > conftest.$ac_ext < +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include int main() { struct ext2_super_block es; es.s_journal_inum = 0; ; return 0; } EOF -if { (eval echo configure:1777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_EXT2_JOURNAL_INUM 1 @@ -1788,7 +1837,7 @@ fi rm -f conftest* echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:1792: checking for tgetent in -ltermcap" >&5 +echo "configure:1841: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1796,7 +1845,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1860: \"$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 @@ -1836,17 +1885,17 @@ fi ac_safe=`echo "readline/readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for readline/readline.h""... $ac_c" 1>&6 -echo "configure:1840: checking for readline/readline.h" >&5 +echo "configure:1889: checking for readline/readline.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1899: \"$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* @@ -1869,7 +1918,7 @@ readline_h=no fi echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1873: checking for readline in -lreadline" >&5 +echo "configure:1922: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1877,7 +1926,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline "-ltermcap" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1941: \"$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 @@ -1917,17 +1966,17 @@ fi ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:1921: checking for zlib.h" >&5 +echo "configure:1970: checking for zlib.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1980: \"$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* @@ -1950,7 +1999,7 @@ zlib_h=no fi echo $ac_n "checking for compress2 in -lz""... $ac_c" 1>&6 -echo "configure:1954: checking for compress2 in -lz" >&5 +echo "configure:2003: checking for compress2 in -lz" >&5 ac_lib_var=`echo z'_'compress2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1958,7 +2007,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2022: \"$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 @@ -2004,12 +2053,12 @@ fi for ac_func in err errx verr verrx vwarn vwarnx warn warnx realpath lchown do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2008: checking for $ac_func" >&5 +echo "configure:2057: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2085: \"$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 @@ -2057,12 +2106,12 @@ fi done echo $ac_n "checking for glob""... $ac_c" 1>&6 -echo "configure:2061: checking for glob" >&5 +echo "configure:2110: checking for glob" >&5 if eval "test \"`echo '$''{'ac_cv_func_glob'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_glob=yes" else @@ -2106,10 +2155,10 @@ fi echo $ac_n "checking for extended glob routines""... $ac_c" 1>&6 -echo "configure:2110: checking for extended glob routines" >&5 +echo "configure:2159: checking for extended glob routines" >&5 if test "$ac_cv_func_glob" = "yes"; then cat > conftest.$ac_ext < @@ -2140,12 +2189,12 @@ rm -f conftest* fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2144: checking for ANSI C header files" >&5 +echo "configure:2193: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2153,7 +2202,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2206: \"$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* @@ -2170,7 +2219,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2188,7 +2237,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2209,7 +2258,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2220,7 +2269,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2244,12 +2293,12 @@ EOF fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:2248: checking for quad_t" >&5 +echo "configure:2297: checking for quad_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_quad_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2277,12 +2326,12 @@ EOF fi echo $ac_n "checking for u_quad_t""... $ac_c" 1>&6 -echo "configure:2281: checking for u_quad_t" >&5 +echo "configure:2330: checking for u_quad_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_quad_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS diff --git a/configure.in b/configure.in index a7b608e..a99ea2f 100644 --- a/configure.in +++ b/configure.in @@ -299,13 +299,22 @@ if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs) fi +dnl +dnl Try to use ext2_fs.h header from libext2fs instead of from the kernel +dnl +AC_CHECK_HEADERS(ext2fs/ext2_fs.h) + dnl dnl Check for ext2_ino_t type dnl AC_MSG_CHECKING(for ext2_ino_t type in libext2fs headers) AC_TRY_COMPILE([#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include -#include ], +#endif +#include ], [ext2_ino_t ino = 0;], [AC_DEFINE(HAVE_EXT2_INO_T) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) @@ -315,7 +324,11 @@ dnl Check for s_journal_inum field in ext2_super_block struct dnl AC_MSG_CHECKING(for s_journal_inum field in ext2_super_block struct) AC_TRY_COMPILE([#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include ], [struct ext2_super_block es; es.s_journal_inum = 0;], [AC_DEFINE(HAVE_EXT2_JOURNAL_INUM) AC_MSG_RESULT(yes)], diff --git a/dump/itime.c b/dump/itime.c index 81d8dc7..cc92bb5 100644 --- a/dump/itime.c +++ b/dump/itime.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: itime.c,v 1.18 2001/03/21 09:37:13 stelian Exp $"; + "$Id: itime.c,v 1.19 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -56,7 +56,11 @@ static const char rcsid[] = #include #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #include diff --git a/dump/main.c b/dump/main.c index 82ff7f2..ae9ffce 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.48 2001/04/27 15:22:47 stelian Exp $"; + "$Id: main.c,v 1.49 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -59,7 +59,11 @@ static const char rcsid[] = #include #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #include diff --git a/dump/optr.c b/dump/optr.c index c9c9239..471ea5b 100644 --- a/dump/optr.c +++ b/dump/optr.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: optr.c,v 1.22 2001/03/20 09:14:58 stelian Exp $"; + "$Id: optr.c,v 1.23 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -61,7 +61,11 @@ static const char rcsid[] = #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #include diff --git a/dump/tape.c b/dump/tape.c index 3f2ae89..f846221 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.46 2001/05/12 11:36:12 stelian Exp $"; + "$Id: tape.c,v 1.47 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -63,7 +63,6 @@ int write(), read(); #ifdef __linux__ #include #include -#include #endif #include #include @@ -71,7 +70,11 @@ int write(), read(); #include #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #elif defined sunos diff --git a/dump/traverse.c b/dump/traverse.c index e4cf7d3..df59305 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.33 2001/04/11 13:42:52 stelian Exp $"; + "$Id: traverse.c,v 1.34 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -55,7 +55,11 @@ static const char rcsid[] = #include #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #include diff --git a/dump/unctime.c b/dump/unctime.c index 27efcf5..c03bb65 100644 --- a/dump/unctime.c +++ b/dump/unctime.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: unctime.c,v 1.10 2000/12/21 11:14:54 stelian Exp $"; + "$Id: unctime.c,v 1.11 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -55,7 +55,11 @@ static const char rcsid[] = #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #endif diff --git a/restore/dirs.c b/restore/dirs.c index 6398f87..b15b1d0 100644 --- a/restore/dirs.c +++ b/restore/dirs.c @@ -46,7 +46,7 @@ #ifndef lint static const char rcsid[] = - "$Id: dirs.c,v 1.14 2001/03/20 10:02:48 stelian Exp $"; + "$Id: dirs.c,v 1.15 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -55,7 +55,11 @@ static const char rcsid[] = #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #else /* __linux__ */ #include diff --git a/restore/interactive.c b/restore/interactive.c index 3b184fc..c8f54f5 100644 --- a/restore/interactive.c +++ b/restore/interactive.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: interactive.c,v 1.16 2001/03/20 10:02:48 stelian Exp $"; + "$Id: interactive.c,v 1.17 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -49,7 +49,11 @@ static const char rcsid[] = #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #else /* __linux__ */ #include diff --git a/restore/restore.c b/restore/restore.c index 0be2db1..d9561d8 100644 --- a/restore/restore.c +++ b/restore/restore.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: restore.c,v 1.17 2001/04/26 08:28:29 stelian Exp $"; + "$Id: restore.c,v 1.18 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -51,7 +51,11 @@ static const char rcsid[] = #include #include #include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #else /* __linux__ */ #include diff --git a/restore/symtab.c b/restore/symtab.c index 2e157f4..d020f66 100644 --- a/restore/symtab.c +++ b/restore/symtab.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: symtab.c,v 1.15 2001/05/12 11:36:12 stelian Exp $"; + "$Id: symtab.c,v 1.16 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ /* @@ -60,7 +60,11 @@ static const char rcsid[] = #ifdef __linux__ #include #include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #else /* __linux__ */ #include diff --git a/restore/tape.c b/restore/tape.c index d7e8ed6..ee5c72f 100644 --- a/restore/tape.c +++ b/restore/tape.c @@ -46,7 +46,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.39 2001/05/26 11:04:46 stelian Exp $"; + "$Id: tape.c,v 1.40 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -67,7 +67,11 @@ static const char rcsid[] = #ifdef __linux__ #include #include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #else /* __linux__ */ diff --git a/restore/utilities.c b/restore/utilities.c index 95cb216..1d88c85 100644 --- a/restore/utilities.c +++ b/restore/utilities.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: utilities.c,v 1.15 2001/04/24 10:59:13 stelian Exp $"; + "$Id: utilities.c,v 1.16 2001/06/18 10:58:28 stelian Exp $"; #endif /* not lint */ #include @@ -57,7 +57,11 @@ static const char rcsid[] = #ifdef __linux__ #include #include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #else /* __linux__ */ -- 2.39.5