=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- OpenXM_contrib2/asir2000/configure 2003/03/07 05:19:53 1.15 +++ OpenXM_contrib2/asir2000/configure 2003/03/07 05:40:15 1.16 @@ -308,7 +308,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE LN_S RANLIB ac_ct_RANLIB YACC CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP PARIINC PARILIB USE_PLOT_TRUE USE_PLOT_FALSE FEPLIB MPIINC MPILIB LAPACKLIB libasir_postfix asm_obj LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE LN_S RANLIB ac_ct_RANLIB YACC CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PARIINC PARILIB EGREP USE_PLOT_TRUE USE_PLOT_FALSE FEPLIB MPIINC MPILIB LAPACKLIB libasir_postfix asm_obj LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1569,7 +1569,7 @@ fi # Define the identity of the package. PACKAGE=asir -VERSION=20030128 +VERSION=20030307 cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" @@ -4355,10 +4355,10 @@ fi; if test ${with_pari:=no} != no ; then libasir_postfix=${libasir_postfix}_pari - if test ${with_pari} = old ; then - libpari=pari - else + if test ${with_pari} = new ; then libpari=pari-2.2 + else + libpari=pari fi PARIINC='-I${prefix}/include/pari' if test "${enable_shared}" != yes ; then @@ -4370,7 +4370,11 @@ if test ${with_pari:=no} != no ; then #define PARI 1 _ACEOF - echo "$as_me:$LINENO: checking for egrep" >&5 +fi + + + +echo "$as_me:$LINENO: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4969,21 +4973,17 @@ cat >>confdefs.h <<_ACEOF _ACEOF - if test SIZEOF_LONG = 8; then - cat >>confdefs.h <<\_ACEOF +if test SIZEOF_LONG = 8; then + cat >>confdefs.h <<\_ACEOF #define LONG_IS_64BIT 1 _ACEOF - else - cat >>confdefs.h <<\_ACEOF +else + cat >>confdefs.h <<\_ACEOF #define LONG_IS_32BIT 1 _ACEOF - fi fi - - - if test "${no_x}" != yes ; then # Check whether --enable-plot or --disable-plot was given. if test "${enable_plot+set}" = set; then @@ -6111,9 +6111,9 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@EGREP@,$EGREP,;t t s,@PARIINC@,$PARIINC,;t t s,@PARILIB@,$PARILIB,;t t +s,@EGREP@,$EGREP,;t t s,@USE_PLOT_TRUE@,$USE_PLOT_TRUE,;t t s,@USE_PLOT_FALSE@,$USE_PLOT_FALSE,;t t s,@FEPLIB@,$FEPLIB,;t t