From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 2AB3F3872227; Sun, 11 Dec 2022 15:05:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AB3F3872227 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670771111; bh=DWQ/UDCGBjlg3ItRr3VcmXhaZBnTxaM74wKOb6I/GvM=; h=From:To:Subject:Date:From; b=otkyjWkJv9By0pN5/fI6307yx9eBHoDVhjCzqQBXr9ypxa4HrUQepLSQ86GTlymYx Zkoq4EH8jyRX6s7DzbgFkQRVadl0EpsBtUrfl4WwDcz8gny3BCX+kCCqekAr19ph/6 J++1BYEcYgW4KILTcLJ2E1P7bGtxLFS/sW24GD5Y= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/modula-2] Remove incomplete ServerSocket module. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/devel/modula-2 X-Git-Oldrev: fd7e0571835d88fec8e861771e94bcc893be536b X-Git-Newrev: 74d1529a3636ad3ea0ff24aa5bba8320fc550c01 Message-Id: <20221211150511.2AB3F3872227@sourceware.org> Date: Sun, 11 Dec 2022 15:05:11 +0000 (GMT) List-Id: https://gcc.gnu.org/g:74d1529a3636ad3ea0ff24aa5bba8320fc550c01 commit 74d1529a3636ad3ea0ff24aa5bba8320fc550c01 Author: Gaius Mulley Date: Sun Dec 11 15:03:41 2022 +0000 Remove incomplete ServerSocket module. Final (hopeful) tidying up before the merge. Remove the incomplete additional module as it is not part of the ISO standard and it could return when complete during the next stage1. ChangeLog: * configure: Rebuilt. gcc/ChangeLog: * configure: Rebuilt. gcc/m2/ChangeLog: * gm2-libs-iso/ServerSocket.def: Removed. * gm2-libs-iso/ServerSocket.mod: Removed. libgm2/ChangeLog: * Makefile.in: Rebuilt. * configure: Rebuilt. * libm2cor/Makefile.in: Rebuilt. * libm2iso/Makefile.am (M2DEFS): Remove ServerSocket.def. (M2MODS) Remove ServerSocket.mod. * libm2iso/Makefile.in: Rebuilt. * libm2log/Makefile.in: Rebuilt. * libm2min/Makefile.in: Rebuilt. * libm2pim/Makefile.in: Rebuilt. Signed-off-by: Gaius Mulley Diff: --- configure | 14 +-- gcc/configure | 239 +++++++++++++++++++++++++++++++++++++++++++- gcc/m2/configure | 14 +-- libgm2/Makefile.in | 1 - libgm2/configure | 18 +--- libgm2/libm2cor/Makefile.in | 1 - libgm2/libm2iso/Makefile.am | 4 +- libgm2/libm2iso/Makefile.in | 9 +- libgm2/libm2log/Makefile.in | 1 - libgm2/libm2min/Makefile.in | 1 - libgm2/libm2pim/Makefile.in | 1 - 11 files changed, 247 insertions(+), 56 deletions(-) diff --git a/configure b/configure index 332f84187af..2b86f25656b 100755 --- a/configure +++ b/configure @@ -767,7 +767,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -937,7 +936,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1190,15 +1188,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1336,7 +1325,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1496,7 +1485,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/gcc/configure b/gcc/configure index 6af7dbd06b0..913310c6bd2 100755 --- a/gcc/configure +++ b/gcc/configure @@ -805,6 +805,17 @@ am__leading_dot doc_build_sys AR NM +HAVE_PYTHON_FALSE +HAVE_PYTHON_TRUE +pkgpyexecdir +pyexecdir +pkgpythondir +pythondir +PYTHON_PLATFORM +PYTHON_EXEC_PREFIX +PYTHON_PREFIX +PYTHON_VERSION +PYTHON BISON FLEX GENERATED_MANPAGES @@ -1046,6 +1057,7 @@ CXXFLAGS CCC CXXCPP CPP +PYTHON GMPLIBS GMPINC ISLLIBS @@ -1887,6 +1899,7 @@ Some influential environment variables: CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor CPP C preprocessor + PYTHON the Python interpreter GMPLIBS How to link GMP GMPINC How to find GMP include files ISLLIBS How to link isl @@ -8899,6 +8912,223 @@ done test -n "$BISON" || BISON="$MISSING bison" +# Python3? + + + + + + + # Find any Python interpreter. + if test -z "$PYTHON"; then + for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $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 + + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON=":" + + fi + am_display_PYTHON=python + + + if test "$PYTHON" = :; then + : + else + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + + + + PYTHON_PREFIX='${prefix}' + + PYTHON_EXEC_PREFIX='${exec_prefix}' + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[:3] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + + + pkgpythondir=\${pythondir}/$PACKAGE + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if ${am_cv_python_pyexecdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + + + pkgpyexecdir=\${pyexecdir}/$PACKAGE + + + + fi + + + if test "$PYTHON" != :; then + HAVE_PYTHON_TRUE= + HAVE_PYTHON_FALSE='#' +else + HAVE_PYTHON_TRUE='#' + HAVE_PYTHON_FALSE= +fi + + # Binutils are not build modules, unlike bison/flex/makeinfo. So we # check for build == host before using them. @@ -19712,7 +19942,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19715 "configure" +#line 19945 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19818,7 +20048,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19821 "configure" +#line 20051 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -32621,6 +32851,10 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then + as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" @@ -33909,4 +34143,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/gcc/m2/configure b/gcc/m2/configure index 31175ed6409..db1ca3d1f9b 100755 --- a/gcc/m2/configure +++ b/gcc/m2/configure @@ -662,7 +662,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -733,7 +732,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -986,15 +984,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1132,7 +1121,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1285,7 +1274,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in index 5d33a15a222..ec9094b345d 100644 --- a/libgm2/Makefile.in +++ b/libgm2/Makefile.in @@ -288,7 +288,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ slibdir = @slibdir@ diff --git a/libgm2/configure b/libgm2/configure index 4ba82307ebb..889c0926a15 100755 --- a/libgm2/configure +++ b/libgm2/configure @@ -767,7 +767,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -853,7 +852,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1106,15 +1104,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1252,7 +1241,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1405,7 +1394,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -12710,7 +12698,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12713 "configure" +#line 12701 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12816,7 +12804,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12819 "configure" +#line 12807 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index c867e42eca2..6d921cd329d 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -364,7 +364,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index 8c6e2dcfda8..dc547207e79 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -122,7 +122,7 @@ M2DEFS = ChanConsts.def CharClass.def \ RTfio.def RTgen.def \ RTgenif.def RTio.def \ Semaphores.def SeqFile.def \ - ServerSocket.def ShortComplexMath.def \ + ShortComplexMath.def \ ShortIO.def ShortWholeIO.def \ SimpleCipher.def SIOResult.def \ SLongIO.def SLongWholeIO.def \ @@ -161,7 +161,7 @@ M2MODS = ChanConsts.mod CharClass.mod \ RTfio.mod RTgenif.mod \ RTgen.mod RTio.mod \ Semaphores.mod SeqFile.mod \ - ServerSocket.mod ShortComplexMath.mod \ + ShortComplexMath.mod \ ShortIO.mod ShortWholeIO.mod \ SimpleCipher.mod SIOResult.mod \ SLongIO.mod SLongWholeIO.mod \ diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index e83b9914af8..04aba0f032b 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -168,8 +168,8 @@ libm2iso_la_LIBADD = @BUILD_ISOLIB_TRUE@ RealIO.lo RealMath.lo RealStr.lo RndFile.lo \ @BUILD_ISOLIB_TRUE@ RTdata.lo RTentity.lo RTfio.lo RTgenif.lo \ @BUILD_ISOLIB_TRUE@ RTgen.lo RTio.lo Semaphores.lo SeqFile.lo \ -@BUILD_ISOLIB_TRUE@ ServerSocket.lo ShortComplexMath.lo \ -@BUILD_ISOLIB_TRUE@ ShortIO.lo ShortWholeIO.lo SimpleCipher.lo \ +@BUILD_ISOLIB_TRUE@ ShortComplexMath.lo ShortIO.lo \ +@BUILD_ISOLIB_TRUE@ ShortWholeIO.lo SimpleCipher.lo \ @BUILD_ISOLIB_TRUE@ SIOResult.lo SLongIO.lo SLongWholeIO.lo \ @BUILD_ISOLIB_TRUE@ SRawIO.lo SRealIO.lo SShortIO.lo \ @BUILD_ISOLIB_TRUE@ SShortWholeIO.lo StdChans.lo STextIO.lo \ @@ -388,7 +388,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. @@ -500,7 +499,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_ISOLIB_TRUE@ RTfio.def RTgen.def \ @BUILD_ISOLIB_TRUE@ RTgenif.def RTio.def \ @BUILD_ISOLIB_TRUE@ Semaphores.def SeqFile.def \ -@BUILD_ISOLIB_TRUE@ ServerSocket.def ShortComplexMath.def \ +@BUILD_ISOLIB_TRUE@ ShortComplexMath.def \ @BUILD_ISOLIB_TRUE@ ShortIO.def ShortWholeIO.def \ @BUILD_ISOLIB_TRUE@ SimpleCipher.def SIOResult.def \ @BUILD_ISOLIB_TRUE@ SLongIO.def SLongWholeIO.def \ @@ -539,7 +538,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_ISOLIB_TRUE@ RTfio.mod RTgenif.mod \ @BUILD_ISOLIB_TRUE@ RTgen.mod RTio.mod \ @BUILD_ISOLIB_TRUE@ Semaphores.mod SeqFile.mod \ -@BUILD_ISOLIB_TRUE@ ServerSocket.mod ShortComplexMath.mod \ +@BUILD_ISOLIB_TRUE@ ShortComplexMath.mod \ @BUILD_ISOLIB_TRUE@ ShortIO.mod ShortWholeIO.mod \ @BUILD_ISOLIB_TRUE@ SimpleCipher.mod SIOResult.mod \ @BUILD_ISOLIB_TRUE@ SLongIO.mod SLongWholeIO.mod \ diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in index 30070ec5f03..be8a59d2a56 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -353,7 +353,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index f2ec8705936..8210c2e2fa9 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -343,7 +343,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index 338fcf8766d..ed14837c0a4 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -378,7 +378,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc.