$OpenBSD: patch-admin_detect-autoconf_sh,v 1.1 2008/03/19 09:21:37 ajacoutot Exp $ --- admin/detect-autoconf.sh.orig Tue Jan 8 15:02:17 2008 +++ admin/detect-autoconf.sh Tue Jan 8 15:03:15 2008 @@ -7,67 +7,6 @@ AUTOM4TE="autom4te" AUTOMAKE="automake" ACLOCAL="aclocal" - -# We don't use variable here for remembering the type ... strings. -# local variables are not that portable, but we fear namespace issues with -# our includer. The repeated type calls are not that expensive. -checkAutoconf() -{ - if test -x "`$WHICH autoconf-2.5x`" ; then - AUTOCONF="`$WHICH autoconf-2.5x`" - elif test -x "`$WHICH autoconf-2.53`" ; then - AUTOCONF="`$WHICH autoconf-2.53`" - elif test -x "`$WHICH autoconf253`" ; then - AUTOCONF="`$WHICH autoconf253`" - elif test -x "`$WHICH autoconf-2.52`" ; then - AUTOCONF="`$WHICH autoconf-2.52`" - elif test -x "`$WHICH autoconf2.50`" ; then - AUTOCONF="`$WHICH autoconf2.50`" - fi -} - -checkAutoheader() -{ - if test -x "`$WHICH autoheader-2.5x`" ; then - AUTOHEADER="`$WHICH autoheader-2.5x`" - AUTOM4TE="`$WHICH autom4te-2.5x`" - elif test -x "`$WHICH autoheader-2.53`" ; then - AUTOHEADER="`$WHICH autoheader-2.53`" - AUTOM4TE="`$WHICH autom4te-2.53`" - elif test -x "`$WHICH autoheader253`" ; then - AUTOHEADER="`$WHICH autoheader253`" - AUTOM4TE="`$WHICH autom4te253`" - elif test -x "`$WHICH autoheader-2.52`" ; then - AUTOHEADER="`$WHICH autoheader-2.52`" - elif test -x "`$WHICH autoheader2.50`" ; then - AUTOHEADER="`$WHICH autoheader2.50`" - fi -} - -checkAutomakeAclocal () -{ - if test -z "$UNSERMAKE"; then - if test -x "`$WHICH automake-1.8`" ; then - AUTOMAKE="`$WHICH automake-1.8`" - ACLOCAL="`$WHICH aclocal-1.8`" - elif test -x "`$WHICH automake-1.7`" ; then - AUTOMAKE="`$WHICH automake-1.7`" - ACLOCAL="`$WHICH aclocal-1.7`" - elif test -x "`$WHICH automake-1.5`" ; then - AUTOMAKE="`$WHICH automake-1.5`" - ACLOCAL="`$WHICH aclocal-1.5`" - elif test -x "`$WHICH automake15`" ; then - AUTOMAKE="`$WHICH automake15`" - ACLOCAL="`$WHICH aclocal15`" - elif test -x "`$WHICH automake-1.6`" ; then - AUTOMAKE="`$WHICH automake-1.6`" - ACLOCAL="`$WHICH aclocal-1.6`" - fi - else - AUTOMAKE="$UNSERMAKE" - fi -} - checkWhich () { WHICH="" @@ -78,8 +17,5 @@ checkWhich () } checkWhich -checkAutoconf -checkAutoheader -checkAutomakeAclocal export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL