--- rpl/Attic/configure.in 2010/01/26 15:22:44 1.1.1.1 +++ rpl/Attic/configure.in 2010/02/10 10:14:17 1.6 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.0.9]) +AC_INIT([rpl],[4.0.11]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -250,31 +250,21 @@ if test ! -d "$srcdir"/tools/$GPP; then fi if test ! -d "$srcdir"/tools/$FILE; then gunzip -c "$srcdir"/tools/$FILE.tar.gz | \ - (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir/tools" && tar -xf - ) + (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1) + sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \ + "$srcdir"/tools/$FILE/src/Makefile.am2 + sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \ + "$srcdir"/tools/$FILE/src/Makefile.am2 | \ + sed 's/^file_/rplfile_/g' > \ + "$srcdir"/tools/$FILE/src/Makefile.am + \rm -f "$srcdir"/tools/$FILE/src/Makefile.am2 fi if test ! -d "$srcdir"/tools/$ICONV; then gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) fi -dnl Apply patches -AC_CHECK_FUNC(asprintf, ASPRINTF=found, ASPRINTF=not_found) - -sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \ - "$srcdir"/tools/$FILE/src/Makefile.am2 -sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \ - "$srcdir"/tools/$FILE/src/Makefile.am2 | \ - sed 's/^file_/rplfile_/g' > \ - "$srcdir"/tools/$FILE/src/Makefile.am -\rm -f "$srcdir"/tools/$FILE/src/Makefile.am2 -if test $(grep rplfile "$srcdir"/tools/$FILE/magic/Makefile.am | wc -l) \ - -eq 0; then \ - sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \ - "$srcdir"/tools/$FILE/src/Makefile.am2; \ - \mv -f "$srcdir"/tools/$FILE/src/Makefile.am2 \ - "$srcdir"/tools/$FILE/magic/Makefile.am; \ -fi - AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no) if test "$LIBTOOLIZE" = "no"; then AC_MSG_ERROR([Cannot find libtoolize! You have to install it.]) @@ -295,16 +285,6 @@ if test "$AUTOCONF" = "no"; then AC_MSG_ERROR([Cannot find autoconf! You have to install it.]) fi -if test "$ASPRINTF" = not_found; then - if test -z "$(grep asprintf.c \ - "$srcdir"/tools/$FILE/src/Makefile.am)"; then -dnl Nécessaire jusqu'à file-4.25 -dnl echo "librplfile_la_SOURCES += ../../patches/asprintf.c" >> \ -dnl "$srcdir"/tools/$FILE/src/Makefile.am - echo Not needed anymore - fi -fi - (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \ && aclocal && automake -af && autoconf);