[BACK]Return to configure CVS log [TXT] [DIR] Up to [local] / rpl

Diff for /rpl/Attic/configure between versions 1.16 and 1.17

version 1.16, 2010/04/07 13:44:59 version 1.17, 2010/04/17 18:57:33
Line 608  GSL Line 608  GSL
 UNITS  UNITS
 READLINE  READLINE
 NCURSES  NCURSES
   SEMAPHORES_NOMMES
   NESTED_FUNCTIONS
   EXPORT_DYNAMIC
 LIBMTMALLOC  LIBMTMALLOC
 OS  OS
 GNUPLOT_COMPILATION  GNUPLOT_COMPILATION
Line 641  SED Line 644  SED
 RANLIB  RANLIB
 LN_S  LN_S
 RUNPATH  RUNPATH
 LIBTOOLIZE  
 PROFILAGE  PROFILAGE
 X_EXTRA_LIBS  X_EXTRA_LIBS
 X_LIBS  X_LIBS
Line 789  XMKMF Line 791  XMKMF
 CPP'  CPP'
 ac_subdirs_all='tools/$NCURSES  ac_subdirs_all='tools/$NCURSES
 tools/$READLINE  tools/$READLINE
 tools/$UNITS  
 tools/$GSL  tools/$GSL
 tools/$GPP  tools/$GPP
 tools/$FILE  tools/$FILE
 tools/$ICONV  tools/$ICONV
 tools/$SQLITE  tools/$SQLITE
   tools/$UNITS
 tools/$GNUPLOT'  tools/$GNUPLOT'
   
 # Initialize some variables set by options.  # Initialize some variables set by options.
Line 6042  fi Line 6044  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 > $TMP  
     sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \  
         sed 's/^file_/rplfile_/g' > \  
         "$srcdir"/tools/$FILE/src/Makefile.am  
     sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP  
     \mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am  
     (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \  
         && aclocal && automake -af && autoconf);  
 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 6066  if test ! -d tools/$OPENSSL; then Line 6059  if test ! -d tools/$OPENSSL; then
             (cd tools && tar -xf -)              (cd tools && tar -xf -)
 fi  fi
   
 # Extract the first word of "libtoolize", so it can be a program name with args.  
 set dummy libtoolize; ac_word=$2  
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5  
 $as_echo_n "checking for $ac_word... " >&6; }  
 if test "${ac_cv_prog_LIBTOOLIZE+set}" = set; then :  
   $as_echo_n "(cached) " >&6  
 else  
   if test -n "$LIBTOOLIZE"; then  
   ac_cv_prog_LIBTOOLIZE="$LIBTOOLIZE" # Let the user override the test.  
 else  
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR  
 for as_dir in $PATH  
 do  
   IFS=$as_save_IFS  
   test -z "$as_dir" && as_dir=.  
     for ac_exec_ext in '' $ac_executable_extensions; do  
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then  
     ac_cv_prog_LIBTOOLIZE="yes"  
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5  
     break 2  
   fi  
 done  
   done  
 IFS=$as_save_IFS  
   
   test -z "$ac_cv_prog_LIBTOOLIZE" && ac_cv_prog_LIBTOOLIZE="no"  
 fi  
 fi  
 LIBTOOLIZE=$ac_cv_prog_LIBTOOLIZE  
 if test -n "$LIBTOOLIZE"; then  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBTOOLIZE" >&5  
 $as_echo "$LIBTOOLIZE" >&6; }  
 else  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5  
 $as_echo "no" >&6; }  
 fi  
   
   
 if test "$LIBTOOLIZE" = "no"; then  
     as_fn_error "Cannot find libtoolize! You have to install it." "$LINENO" 5  
 fi  
   
 # Extract the first word of "aclocal", so it can be a program name with args.  
 set dummy aclocal; ac_word=$2  
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5  
 $as_echo_n "checking for $ac_word... " >&6; }  
 if test "${ac_cv_prog_ACLOCAL+set}" = set; then :  
   $as_echo_n "(cached) " >&6  
 else  
   if test -n "$ACLOCAL"; then  
   ac_cv_prog_ACLOCAL="$ACLOCAL" # Let the user override the test.  
 else  
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR  
 for as_dir in $PATH  
 do  
   IFS=$as_save_IFS  
   test -z "$as_dir" && as_dir=.  
     for ac_exec_ext in '' $ac_executable_extensions; do  
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then  
     ac_cv_prog_ACLOCAL="yes"  
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5  
     break 2  
   fi  
 done  
   done  
 IFS=$as_save_IFS  
   
   test -z "$ac_cv_prog_ACLOCAL" && ac_cv_prog_ACLOCAL="no"  
 fi  
 fi  
 ACLOCAL=$ac_cv_prog_ACLOCAL  
 if test -n "$ACLOCAL"; then  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ACLOCAL" >&5  
 $as_echo "$ACLOCAL" >&6; }  
 else  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5  
 $as_echo "no" >&6; }  
 fi  
   
   
 if test "$ACLOCAL" = "no"; then  
     as_fn_error "Cannot find aclocal! You have to install it." "$LINENO" 5  
 fi  
   
 # Extract the first word of "automake", so it can be a program name with args.  
 set dummy automake; ac_word=$2  
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5  
 $as_echo_n "checking for $ac_word... " >&6; }  
 if test "${ac_cv_prog_AUTOMAKE+set}" = set; then :  
   $as_echo_n "(cached) " >&6  
 else  
   if test -n "$AUTOMAKE"; then  
   ac_cv_prog_AUTOMAKE="$AUTOMAKE" # Let the user override the test.  
 else  
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR  
 for as_dir in $PATH  
 do  
   IFS=$as_save_IFS  
   test -z "$as_dir" && as_dir=.  
     for ac_exec_ext in '' $ac_executable_extensions; do  
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then  
     ac_cv_prog_AUTOMAKE="yes"  
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5  
     break 2  
   fi  
 done  
   done  
 IFS=$as_save_IFS  
   
   test -z "$ac_cv_prog_AUTOMAKE" && ac_cv_prog_AUTOMAKE="no"  
 fi  
 fi  
 AUTOMAKE=$ac_cv_prog_AUTOMAKE  
 if test -n "$AUTOMAKE"; then  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOMAKE" >&5  
 $as_echo "$AUTOMAKE" >&6; }  
 else  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5  
 $as_echo "no" >&6; }  
 fi  
   
   
 if test "$AUTOMAKE" = "no"; then  
     as_fn_error "Cannot find automake! You have to install it." "$LINENO" 5  
 fi  
   
 # Extract the first word of "autoconf", so it can be a program name with args.  
 set dummy autoconf; ac_word=$2  
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5  
 $as_echo_n "checking for $ac_word... " >&6; }  
 if test "${ac_cv_prog_AUTOCONF+set}" = set; then :  
   $as_echo_n "(cached) " >&6  
 else  
   if test -n "$AUTOCONF"; then  
   ac_cv_prog_AUTOCONF="$AUTOCONF" # Let the user override the test.  
 else  
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR  
 for as_dir in $PATH  
 do  
   IFS=$as_save_IFS  
   test -z "$as_dir" && as_dir=.  
     for ac_exec_ext in '' $ac_executable_extensions; do  
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then  
     ac_cv_prog_AUTOCONF="yes"  
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5  
     break 2  
   fi  
 done  
   done  
 IFS=$as_save_IFS  
   
   test -z "$ac_cv_prog_AUTOCONF" && ac_cv_prog_AUTOCONF="no"  
 fi  
 fi  
 AUTOCONF=$ac_cv_prog_AUTOCONF  
 if test -n "$AUTOCONF"; then  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOCONF" >&5  
 $as_echo "$AUTOCONF" >&6; }  
 else  
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5  
 $as_echo "no" >&6; }  
 fi  
   
   
 if test "$AUTOCONF" = "no"; then  
     as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5  
 fi  
   
   
   
 # Check whether --enable-final-run-path was given.  # Check whether --enable-final-run-path was given.
Line 9012  fi Line 8837  fi
 done  done
   
   
   ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared"
   
   
   
 subdirs="$subdirs tools/$NCURSES"  subdirs="$subdirs tools/$NCURSES"
   
 subdirs="$subdirs tools/$READLINE"  subdirs="$subdirs tools/$READLINE"
   
 subdirs="$subdirs tools/$UNITS"  
   
 subdirs="$subdirs tools/$GSL"  subdirs="$subdirs tools/$GSL"
   
 subdirs="$subdirs tools/$GPP"  subdirs="$subdirs tools/$GPP"
Line 9030  subdirs="$subdirs tools/$ICONV" Line 8855  subdirs="$subdirs tools/$ICONV"
   
 subdirs="$subdirs tools/$SQLITE"  subdirs="$subdirs tools/$SQLITE"
   
   subdirs="$subdirs tools/$UNITS"
   
   
   
 # Check whether --with-openssl_arch was given.  # Check whether --with-openssl_arch was given.
Line 9125  else Line 8952  else
     LIBMTMALLOC=      LIBMTMALLOC=
 fi  fi
   
   case $(OS) in
   
       Darwin)
           EXPORT_DYNAMIC=-flat_namespace
           NESTED_FUNCTIONS=-fnested-functions
           SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
       break ;;
   
       Cygwin)
           EXPORT_DYNAMIC=--export-all-symbols
           NESTED_FUNCTIONS=
           SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
       break ;;
   
       *)
           EXPORT_DYNAMIC=--export-dynamic
           NESTED_FUNCTIONS=
           SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
       break ;;
   
   esac
   
   
   
   
   
   
   
Removed from v.1.16  
changed lines
  Added in v.1.17

CVSweb interface <joel.bertrand@systella.fr>