Diff for /rpl/Attic/configure.in between versions 1.7 and 1.23

version 1.7, 2010/02/11 14:18:15 version 1.23, 2010/05/07 09:17:52
Line 1 Line 1
 dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
 AC_INIT([rpl],[4.0.11])  AC_INIT([rpl],[4.0.15])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE  AM_INIT_AUTOMAKE
Line 10  dnl Libraries Line 10  dnl Libraries
 NCURSES=ncurses-5.7-20100206  NCURSES=ncurses-5.7-20100206
 READLINE=readline-6.1  READLINE=readline-6.1
 UNITS=units-1.87  UNITS=units-1.87
 GSL=gsl-1.13  GSL=gsl-1.14
 GPP=gpp-2.24  GPP=gpp-2.24
 GNUPLOT=gnuplot-4.2.6  GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03  FILE=file-5.03
 ICONV=libiconv-1.13.1  ICONV=libiconv-1.13.1
   SQLITE=sqlite-3.6.23.1
   OPENSSL=openssl-1.0.0
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc-4.4 gcc)  AC_PROG_CC(gcc-4.4 gcc)
Line 116  fi],[ Line 118  fi],[
 AC_ARG_ENABLE(final-encoding,  AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [  [  --enable-final-encoding force final encoding [[default=guessed]]], [
 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],
 FINAL_ENCODING="\$(shell locale charmap)")  FINAL_ENCODING="\$(shell locale charmap | \
       \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')")
   
 AC_ARG_ENABLE(tex,  AC_ARG_ENABLE(tex,
 [  --enable-tex            provide the TeX support [[default=guessed]]], [  [  --enable-tex            provide the TeX support [[default=guessed]]], [
Line 201  AC_ARG_ENABLE(debug, Line 205  AC_ARG_ENABLE(debug,
 [  --enable-debug          enable debug code [[default=no]]], [  [  --enable-debug          enable debug code [[default=no]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     DEBUG=""      DEBUG=""
     DEBUG_CODE="-UDEBUG"  
 else  else
     AC_CHECK_LIB(efence, DEBUG="-lefence", DEBUG="")      DEBUG="-DDEBUG_MEMOIRE"
     DEBUG_CODE="-DDEBUG"  fi], [DEBUG=""])
     if test "$DEBUG" = ""; then  
         AC_MSG_WARN([Can not find efence! You may install it.  
 Debug flag is disabled.  
 ])  
     fi  
 fi], [  
 DEBUG_CODE="-UDEBUG"  
 DEBUG=""])  
   
 AC_ARG_ENABLE(profile,  AC_ARG_ENABLE(profile,
 [  --enable-profile        enable profile code [[default=no]]], [  [  --enable-profile        enable profile code [[default=no]]], [
Line 222  else Line 217  else
     PROFILAGE="-pg"      PROFILAGE="-pg"
 fi], [PROFILAGE=""])  fi], [PROFILAGE=""])
   
 AC_SUBST(DEBUG_CODE)  
 AC_SUBST(PROFILAGE)  AC_SUBST(PROFILAGE)
   
 if test ! -d tools; then  if test ! -d tools; then
Line 252  if test ! -d "$srcdir"/tools/$FILE; then Line 246  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 - )
     (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 > \  
         "$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  
     sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \  
         "$srcdir"/tools/$FILE/magic/Makefile.am2  
     \mv -f "$srcdir"/tools/$FILE/magic/Makefile.am2 \  
         "$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 | \
             (cd "$srcdir/tools" && tar -xf -)              (cd "$srcdir/tools" && tar -xf -)
 fi  fi
   if test ! -d "$srcdir"/tools/$SQLITE; then
 AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)      gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \
 if test "$LIBTOOLIZE" = "no"; then              (cd "$srcdir/tools" && tar -xf -)
     AC_MSG_ERROR([Cannot find libtoolize! You have to install it.])  
 fi  
   
 AC_CHECK_PROG(ACLOCAL, aclocal, yes, no)  
 if test "$ACLOCAL" = "no"; then  
     AC_MSG_ERROR([Cannot find aclocal! You have to install it.])  
 fi  
   
 AC_CHECK_PROG(AUTOMAKE, automake, yes, no)  
 if test "$AUTOMAKE" = "no"; then  
     AC_MSG_ERROR([Cannot find automake! You have to install it.])  
 fi  fi
   if test ! -d tools/$OPENSSL; then
 AC_CHECK_PROG(AUTOCONF, autoconf, yes, no)      gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
 if test "$AUTOCONF" = "no"; then              (cd tools && tar -xf -)
     AC_MSG_ERROR([Cannot find autoconf! You have to install it.])  
 fi  fi
   
 (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \  
         && aclocal && automake -af && autoconf);  
   
 dnl Default installation directory  dnl Default installation directory
 AC_PREFIX_DEFAULT(/usr/local)  AC_PREFIX_DEFAULT(/usr/local)
   
Line 315  AC_PROG_LN_S Line 283  AC_PROG_LN_S
 AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
 AC_PROG_RANLIB  AC_PROG_RANLIB
   
 dnl Checks for awk  dnl Checks for nawk
 AC_CHECK_PROG(AWK, awk, yes, no)  AC_CHECK_PROG(AWK, nawk, yes, no)
 if test "$AWK" = no; then  if test "$AWK" = no; then
     AC_MSG_ERROR([Can not find awk !])      AC_MSG_ERROR([Can not find nawk !])
 fi  fi
   
 dnl Checks for sed  dnl Checks for sed
Line 765  AC_FUNC_VPRINTF Line 733  AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \  AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \
         strerror strspn strstr strtod)          strerror strspn strstr strtod)
   
   ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static"
   
 AC_CONFIG_SUBDIRS(tools/$NCURSES)  AC_CONFIG_SUBDIRS(tools/$NCURSES)
 AC_CONFIG_SUBDIRS(tools/$READLINE)  AC_CONFIG_SUBDIRS(tools/$READLINE)
 AC_CONFIG_SUBDIRS(tools/$UNITS)  
 AC_CONFIG_SUBDIRS(tools/$GSL)  AC_CONFIG_SUBDIRS(tools/$GSL)
 AC_CONFIG_SUBDIRS(tools/$GPP)  AC_CONFIG_SUBDIRS(tools/$GPP)
 AC_CONFIG_SUBDIRS(tools/$FILE)  AC_CONFIG_SUBDIRS(tools/$FILE)
 AC_CONFIG_SUBDIRS(tools/$ICONV)  AC_CONFIG_SUBDIRS(tools/$ICONV)
   AC_CONFIG_SUBDIRS(tools/$SQLITE)
   AC_CONFIG_SUBDIRS(tools/$UNITS)
   
   dnl Check for OpenSSL os/comp
   AC_ARG_WITH(openssl_arch,
   [  --with-openssl-arch=ARCH  specify os and compiler for openssl (ARCH or list)],
   [], [with_openssl_arch=none])
   
   if test "x$with_openssl_arch" = xnone; then
       (cd tools/$OPENSSL && ./config)
   elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then
       (cd tools/$OPENSSL && ./Configure)
       AC_MSG_ERROR([OS/COMP informations are required!])
   elif test "x$with_openssl_arch" = xlist; then
       (cd tools/$OPENSSL && ./Configure)
       AC_MSG_ERROR([Please specify OS and Architecture])
   else
       (cd tools/$OPENSSL && ./Configure $with_openssl_arch)
   fi
   
 if test "$MYGNUPLOT" = "yes"; then  if test "$MYGNUPLOT" = "yes"; then
     if test ! -d "$srcdir"/tools/$GNUPLOT; then      if test ! -d "$srcdir"/tools/$GNUPLOT; then
Line 818  case $host_cpu in Line 806  case $host_cpu in
   
 esac  esac
   
   case $host_os in
   
       cygwin*)
           OS=Cygwin
       break ;;
   
       interix*)
           OS=Interix
       break ;;
   
       *)
           OS=$(uname)
       break ;;
   
   esac
   
   AC_SUBST(OS)
   
 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')
   
 if test $(uname) = "SunOS"; then  case $OS in
     LIBMTMALLOC=-lmtmalloc  
 else      Darwin)
     LIBMTMALLOC=          EXPORT_DYNAMIC=-flat_namespace
 fi          NESTED_FUNCTIONS=-fnested-functions
           SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
       break ;;
   
       Cygwin)
           EXPORT_DYNAMIC=--export-all-symbols
           NESTED_FUNCTIONS=
           SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
       break ;;
   
       AIX)
           EXPORT_DYNAMIC=--export-dynamic
           NESTED_FUNCTIONS=
           SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
       break ;;
   
       *)
           EXPORT_DYNAMIC=--export-dynamic
           NESTED_FUNCTIONS=
           SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
       break ;;
   
   esac
   
 AC_SUBST(LIBMTMALLOC)  AC_SUBST(EXPORT_DYNAMIC)
   AC_SUBST(NESTED_FUNCTIONS)
   AC_SUBST(SEMAPHORES_NOMMES)
   
 AC_SUBST(NCURSES)  AC_SUBST(NCURSES)
 AC_SUBST(READLINE)  AC_SUBST(READLINE)
Line 837  AC_SUBST(GPP) Line 867  AC_SUBST(GPP)
 AC_SUBST(GNUPLOT)  AC_SUBST(GNUPLOT)
 AC_SUBST(FILE)  AC_SUBST(FILE)
 AC_SUBST(ICONV)  AC_SUBST(ICONV)
   AC_SUBST(SQLITE)
   AC_SUBST(OPENSSL)
 AC_SUBST(FINAL_ENCODING)  AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)  AC_SUBST(DATE)
 AC_SUBST(DATE_FR)  AC_SUBST(DATE_FR)
Line 859  AC_CONFIG_FILES(scripts/rplcc) Line 891  AC_CONFIG_FILES(scripts/rplcc)
 AC_CONFIG_FILES(scripts/rpllink)  AC_CONFIG_FILES(scripts/rpllink)
 AC_CONFIG_FILES(rpltags/Makefile)  AC_CONFIG_FILES(rpltags/Makefile)
 AC_CONFIG_FILES(rpliconv/Makefile)  AC_CONFIG_FILES(rpliconv/Makefile)
   AC_CONFIG_FILES(rplsums/Makefile)
 AC_CONFIG_FILES(lapack/lapack/Makefile)  AC_CONFIG_FILES(lapack/lapack/Makefile)
 AC_CONFIG_FILES(lapack/blas/Makefile)  AC_CONFIG_FILES(lapack/blas/Makefile)
   AC_CONFIG_FILES(ptmalloc3/Makefile)
   
 AC_CONFIG_FILES(man/rpl.1)  AC_CONFIG_FILES(man/rpl.1)
 AC_CONFIG_FILES(man/rplcc.1)  AC_CONFIG_FILES(man/rplcc.1)

Removed from v.1.7  
changed lines
  Added in v.1.23


CVSweb interface <joel.bertrand@systella.fr>