Diff for /rpl/Attic/configure between versions 1.6 and 1.8

version 1.6, 2010/02/11 14:18:15 version 1.8, 2010/03/04 10:09:30
Line 607  UNITS Line 607  UNITS
 READLINE  READLINE
 NCURSES  NCURSES
 LIBMTMALLOC  LIBMTMALLOC
   OS
   LIBICONV
 GNUPLOT_COMPILATION  GNUPLOT_COMPILATION
 subdirs  subdirs
 EGREP  EGREP
Line 640  LN_S Line 642  LN_S
 RUNPATH  RUNPATH
 LIBTOOLIZE  LIBTOOLIZE
 PROFILAGE  PROFILAGE
 DEBUG_CODE  
 X_EXTRA_LIBS  X_EXTRA_LIBS
 X_LIBS  X_LIBS
 X_PRE_LIBS  X_PRE_LIBS
Line 5832  fi Line 5833  fi
 if test "${enable_final_encoding+set}" = set; then :  if test "${enable_final_encoding+set}" = set; then :
   enableval=$enable_final_encoding;    enableval=$enable_final_encoding;
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     FINAL_ENCODING="\$(shell locale charmap)"      FINAL_ENCODING="\$(shell locale charmap | \
           awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')"
 else  else
     FINAL_ENCODING="$enable_final_encoding"      FINAL_ENCODING="$enable_final_encoding"
 fi  fi
 else  else
   FINAL_ENCODING="\$(shell locale charmap)"    FINAL_ENCODING="\$(shell locale charmap | \
       awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')"
 fi  fi
   
   
Line 5984  if test "${enable_debug+set}" = set; the Line 5987  if test "${enable_debug+set}" = set; the
   enableval=$enable_debug;    enableval=$enable_debug;
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     DEBUG=""      DEBUG=""
     DEBUG_CODE="-UDEBUG"  
 else  else
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEBUG=\"-lefence\" in -lefence" >&5      DEBUG="-DDEBUG_MEMOIRE"
 $as_echo_n "checking for DEBUG=\"-lefence\" in -lefence... " >&6; }  
 if test "${ac_cv_lib_efence_DEBUG___lefence_+set}" = set; then :  
   $as_echo_n "(cached) " >&6  
 else  
   ac_check_lib_save_LIBS=$LIBS  
 LIBS="-lefence  $LIBS"  
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
 /* end confdefs.h.  */  
   
 /* Override any GCC internal prototype to avoid an error.  
    Use char because int might match the return type of a GCC  
    builtin and then its argument prototype would still apply.  */  
 #ifdef __cplusplus  
 extern "C"  
 #endif  
 char DEBUG="-lefence" ();  
 int  
 main ()  
 {  
 return DEBUG="-lefence" ();  
   ;  
   return 0;  
 }  
 _ACEOF  
 if ac_fn_c_try_link "$LINENO"; then :  
   ac_cv_lib_efence_DEBUG___lefence_=yes  
 else  
   ac_cv_lib_efence_DEBUG___lefence_=no  
 fi  
 rm -f core conftest.err conftest.$ac_objext \  
     conftest$ac_exeext conftest.$ac_ext  
 LIBS=$ac_check_lib_save_LIBS  
 fi  
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_DEBUG___lefence_" >&5  
 $as_echo "$ac_cv_lib_efence_DEBUG___lefence_" >&6; }  
 if test "x$ac_cv_lib_efence_DEBUG___lefence_" = x""yes; then :  
   DEBUG=""  
 fi  
   
     DEBUG_CODE="-DDEBUG"  
     if test "$DEBUG" = ""; then  
         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find efence! You may install it.  
 Debug flag is disabled.  
 " >&5  
 $as_echo "$as_me: WARNING: Can not find efence! You may install it.  
 Debug flag is disabled.  
 " >&2;}  
     fi  
 fi  fi
 else  else
     DEBUG=""
 DEBUG_CODE="-UDEBUG"  
 DEBUG=""  
 fi  fi
   
   
Line 6058  fi Line 6010  fi
   
   
   
   
 if test ! -d tools; then  if test ! -d tools; then
     mkdir tools      mkdir tools
 fi  fi
Line 6085  fi Line 6036  fi
 if test ! -d "$srcdir"/tools/$FILE; then  if test ! -d "$srcdir"/tools/$FILE; then
     gunzip -c "$srcdir"/tools/$FILE.tar.gz | \      gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
             (cd "$srcdir/tools" && tar -xf - )              (cd "$srcdir/tools" && tar -xf - )
       TMP=$(mktemp)
     (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)      (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)
     sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \      sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP
         "$srcdir"/tools/$FILE/src/Makefile.am2      sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \
     sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \  
         "$srcdir"/tools/$FILE/src/Makefile.am2 | \  
         sed 's/^file_/rplfile_/g' > \          sed 's/^file_/rplfile_/g' > \
         "$srcdir"/tools/$FILE/src/Makefile.am          "$srcdir"/tools/$FILE/src/Makefile.am
     \rm -f "$srcdir"/tools/$FILE/src/Makefile.am2      sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP
     sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \      \mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am
         "$srcdir"/tools/$FILE/magic/Makefile.am2      (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \
     \mv -f "$srcdir"/tools/$FILE/magic/Makefile.am2 \          && aclocal && automake -af && autoconf);
         "$srcdir"/tools/$FILE/magic/Makefile.am  
 fi  fi
 if test ! -d "$srcdir"/tools/$ICONV; then  if test ! -d "$srcdir"/tools/$ICONV; then
     gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \      gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
Line 6271  if test "$AUTOCONF" = "no"; then Line 6220  if test "$AUTOCONF" = "no"; then
     as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5      as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5
 fi  fi
   
 (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \  
         && aclocal && automake -af && autoconf);  
   
   
   
 # Check whether --enable-final-run-path was given.  # Check whether --enable-final-run-path was given.
Line 9115  case $host_cpu in Line 9061  case $host_cpu in
   
 esac  esac
   
   case $host_os in
   
       cygwin*)
           LIBICONV=libiconv.dll.a
           OS=Cygwin
       break ;;
   
       interix*)
           LIBICONV=libiconv.dll.a
           OS=Interix
       break ;;
   
       *)
           LIBICONV=libiconv.a
           OS=$(uname)
       break ;;
   
   esac
   
   
   
   
 DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')  DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')
 DATE=$(env LC_ALL=C date +'%A %x, %X %Z')  DATE=$(env LC_ALL=C date +'%A %x, %X %Z')
   

Removed from v.1.6  
changed lines
  Added in v.1.8


CVSweb interface <joel.bertrand@systella.fr>