OSSP CVS Repository

ossp - Check-in [35]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 35
Date: 2000-Jun-17 13:27:10 (local)
2000-Jun-17 11:27:10 (UTC)
User:rse
Branch:
Comment: *** empty log message ***
Tickets:
Inspections:
Files:
ossp-pkg/shtool/ChangeLog      1.124 -> 1.125     3 inserted, 0 deleted
ossp-pkg/shtool/shtool.m4      added-> 1.2

ossp-pkg/shtool/ChangeLog 1.124 -> 1.125

--- ChangeLog    2000/06/18 11:20:30     1.124
+++ ChangeLog    2000/06/18 11:27:10     1.125
@@ -11,6 +11,9 @@
 
  Changes between 1.4.9 and 1.4.10 (16-Apr-2000 to 18-Jun-2000):
 
+   *) In shtool.m4 check for shtool also in $ac_aux_dir.
+      [Ralf S. Engelschall]
+
    *) Rewrote the `shtool path -m perl' handling, i.e., the way
       how to find the most reasonable Perl on a system. It now supports
       Perl 5.6.0 because we no longer parse `perl -v' output. Instead we


ossp-pkg/shtool/shtool.m4 -> 1.2

*** /dev/null    Mon Apr 29 07:02:52 2024
--- -    Mon Apr 29 07:03:57 2024
***************
*** 0 ****
--- 1,59 ----
+ ##
+ ##  shtool.m4 -- GNU shtool Autoconf macros
+ ##
+ ##  This file is part of shtool and free software; you can redistribute
+ ##  it and/or modify it under the terms of the GNU General Public
+ ##  License as published by the Free Software Foundation; either version
+ ##  2 of the License, or (at your option) any later version.
+ ##
+ ##  This file is distributed in the hope that it will be useful,
+ ##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ##  General Public License for more details.
+ ##
+ ##  You should have received a copy of the GNU General Public License
+ ##  along with this program; if not, write to the Free Software
+ ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ ##  USA, or contact Ralf S. Engelschall <rse@engelschall.com>.
+ ##
+ 
+ ##
+ ##  the standard macro for finding GNU shtool:
+ ##  AC_PROG_SHTOOL
+ ##
+ AC_DEFUN(AC_PROG_SHTOOL,[dnl
+ AC_PREREQ(2.13)dnl
+ AC_MSG_CHECKING([for GNU shtool])
+ AC_CACHE_VAL(ac_cv_shtool,[dnl
+ #   canonicalize and split path string
+ ac_paths="`echo .:$ac_aux_dir:$PATH |\
+            sed -e 's%/*:%:%g' -e 's%/*$%%' \
+                -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
+                -e 's/:/ /g'`"
+ #   iterate over $PATH but prefer CWD
+ ac_cv_shtool=""
+ for ac_path in $ac_paths; do
+     if test -f "$ac_path/shtool" && test ! -d "$ac_path/shtool"; then
+         ac_cv_shtool="$ac_path/shtool"
+         break
+     fi
+ done
+ #   check for existance    
+ if test ".$ac_cv_shtool" = .; then
+     AC_MSG_ERROR([no shtool found in .:$PATH])
+ fi
+ #   check deeper
+ ac_rc=`($ac_cv_shtool --version) </dev/null 2>/dev/null | grep 'GNU shtool'`
+ if test ".$ac_rc" = .; then
+     ac_cv_shtool="${CONFIG_SHELL-/bin/sh} $ac_cv_shtool"
+     ac_rc=`($ac_cv_shtool --version) </dev/null 2>/dev/null | grep 'GNU shtool'`
+     if test ".$ac_rc" = .; then
+         AC_MSG_ERROR([$ac_cv_shtool seems not to be GNU shtool])
+     fi
+ fi
+ ])dnl
+ AC_MSG_RESULT([$ac_cv_shtool])
+ SHTOOL="$ac_cv_shtool"
+ AC_SUBST(SHTOOL)
+ ])
+ 

CVSTrac 2.0.1