Changeset 8a9b23c in git

Timestamp:

May 6, 1997, 7:17:56 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

43d6c5e0633d3e100f8b9f03090a0b47e622409d

Parents:

63eab75b813566a3916ad6806e505bbb1bffb25f

Message:

Tue May  6 09:30:51 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* configure.in: Manuallu put INSTALL into Makefile.in

T


git-svn-id: file:///usr/local/Singular/svn/trunk@268 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

libfac

Files:

• ChangeLog (added)
• Makefile.in (modified) (2 diffs)
• configure (modified) (10 diffs)
• configure.in (modified) (1 diff)
• mkinstalldirs (added)

libfac/Makefile.in

@@ -1 @@
-# $Id: Makefile.in,v 1.2 1997-05-05 13:44:19 obachman Exp $
+# $Id: Makefile.in,v 1.3 1997-05-06 17:17:54 obachman Exp $
 #################################################
 SHELL           = /bin/sh
@@ -28 +28 @@
 RANLIB          = @RANLIB@
 CXX             = @CXX@
-INSTALL         = @INSTALL@
-INSTALL_DATA    = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-MKINSTALLDIRS   = @MKINSTALLDIRS@
+INSTALL         = ./install-sh -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA    = ${INSTALL} -m 644
+MKINSTALLDIRS   = ./mkinstalldirs
 
 ##

libfac/configure

@@ -794 +794 @@
 fi
 
-ac_save_path=${PATH}
-PATH="$PATH:.."  
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-          if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-            # AIX install.  It has an incompatible calling convention.
-            # OSF/1 installbsd also uses dspmsg, but is usable.
-            :
-          else
-            ac_cv_path_install="$ac_dir/$ac_prog -c"
-            break 2
-          fi
-        fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_ifs"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-# Extract the first word of "mkinstalldirs", so it can be a program name with args.
-set dummy mkinstalldirs; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_MKINSTALLDIRS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MKINSTALLDIRS" in
-  /*)
-  ac_cv_path_MKINSTALLDIRS="$MKINSTALLDIRS" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_MKINSTALLDIRS="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MKINSTALLDIRS" && ac_cv_path_MKINSTALLDIRS="-mkdir -p"
-  ;;
-esac
-fi
-MKINSTALLDIRS="$ac_cv_path_MKINSTALLDIRS"
-if test -n "$MKINSTALLDIRS"; then
-  echo "$ac_t""$MKINSTALLDIRS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-PATH="$ac_save_path"
-
 ac_safe=`echo "factory.h" | tr './\055' '___'`
 echo $ac_n "checking for factory.h""... $ac_c" 1>&6
@@ -913 +800 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 916 "configure"
+#line 803 "configure"
 #include "confdefs.h"
 #include <factory.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -946 +833 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 949 "configure"
+#line 836 "configure"
 #include "confdefs.h"
 
@@ -996 +883 @@
 ; return 0; }
 EOF
-if { (eval echo configure:999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -1022 +909 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1025 "configure"
+#line 912 "configure"
 #include "confdefs.h"
 
@@ -1030 +917 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -1163 +1050 @@
 
 ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -1207 +1093 @@
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
 s%@CXXTEMPLFLAGS@%$CXXTEMPLFLAGS%g
 
@@ -1251 +1134 @@
   esac
 
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
   echo creating "$ac_file"
   rm -f "$ac_file"
@@ -1267 +1146 @@
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
 " -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
 fi; done

libfac/configure.in

@@ -87 +87 @@
 
 dnl
-dnl programs for installation
-dnl
-ac_save_path=${PATH}
-PATH="$PATH:.."  
-AC_PROG_INSTALL
-AC_PATH_PROG(MKINSTALLDIRS, mkinstalldirs, -mkdir -p)
-PATH="$ac_save_path"
-
-dnl
 dnl Checks for header files.
 dnl