GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2004-09-14 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* pth.m4: Disable _ac_pth_line, and don't fail if Pth is not
	found.
This commit is contained in:
Marcus Brinkmann 2004-09-14 18:31:45 +00:00
parent 3e4881a65a
commit 851f76fe5d
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/ChangeLog
View File

@ -1,5 +1,8 @@
2004-09-14 Marcus Brinkmann <marcus@g10code.de> 2004-09-14 Marcus Brinkmann <marcus@g10code.de>
* pth.m4: Disable _ac_pth_line, and don't fail if Pth is not
found.
* glibc21.m4: New file. * glibc21.m4: New file.
* gpg-error.m4: New file. * gpg-error.m4: New file.
* pth.m4: New file. * pth.m4: New file.

52
m4/pth.m4
View File

@ -1,6 +1,6 @@
dnl ## dnl ##
dnl ## GNU Pth - The GNU Portable Threads dnl ## GNU Pth - The GNU Portable Threads
dnl ## Copyright (c) 1999-2003 Ralf S. Engelschall <rse@engelschall.com> dnl ## Copyright (c) 1999-2002 Ralf S. Engelschall <rse@engelschall.com>
dnl ## dnl ##
dnl ## This file is part of GNU Pth, a non-preemptive thread scheduling dnl ## This file is part of GNU Pth, a non-preemptive thread scheduling
dnl ## library which can be found at http://www.gnu.org/software/pth/. dnl ## library which can be found at http://www.gnu.org/software/pth/.
@ -21,7 +21,7 @@ dnl ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
dnl ## USA, or contact Ralf S. Engelschall <rse@engelschall.com>. dnl ## USA, or contact Ralf S. Engelschall <rse@engelschall.com>.
dnl ## dnl ##
dnl ## pth.m4: Autoconf macro for locating GNU Pth from within dnl ## pth.m4: Autoconf macro for locating GNU Pth from within
dnl ## configure.ac of third-party software packages dnl ## configure.in of third-party software packages
dnl ## dnl ##
dnl ## dnl ##
@ -42,14 +42,14 @@ dnl
dnl # auxilliary macros dnl # auxilliary macros
AC_DEFUN(_AC_PTH_ERROR, [dnl AC_DEFUN(_AC_PTH_ERROR, [dnl
AC_MSG_RESULT([*FAILED*]) AC_MSG_RESULT([*FAILED*])
define(_ac_pth_line,dnl dnl define(_ac_pth_line,dnl
"+------------------------------------------------------------------------+") dnl "+------------------------------------------------------------------------+")
echo " _ac_pth_line" 1>&2 dnl echo " _ac_pth_line" 1>&2
cat <<EOT | sed -e 's/^[[ ]]*/ | /' -e 's/>>/ /' 1>&2 cat <<EOT | sed -e 's/^[[ ]]*/ | /' -e 's/>>/ /' 1>&2
$1 $1
EOT EOT
echo " _ac_pth_line" 1>&2 dnl echo " _ac_pth_line" 1>&2
undefine(_ac_pth_line) dnl undefine(_ac_pth_line)
exit 1 exit 1
]) ])
AC_DEFUN(_AC_PTH_VERBOSE, [dnl AC_DEFUN(_AC_PTH_VERBOSE, [dnl
@ -207,24 +207,26 @@ if test ".$with_pth" != .no; then
_AC_PTH_VERBOSE([ o path: $_pth_location]) _AC_PTH_VERBOSE([ o path: $_pth_location])
_AC_PTH_VERBOSE([ o type: $_pth_type]) _AC_PTH_VERBOSE([ o type: $_pth_type])
if test ".$_pth_version" = .; then if test ".$_pth_version" = .; then
if test ".$with_pth" != .yes; then with_pth=no
_AC_PTH_ERROR([dnl
Unable to locate GNU Pth under $with_pth.
Please specify the correct path to either a GNU Pth installation tree
(use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in
the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a
path to a pth-X.Y.Z/ directory; but make sure the package is already
built, i.e., the "configure; make" step was already performed there).])
else else
_AC_PTH_ERROR([dnl dnl if test ".$with_pth" != .yes; then
Unable to locate GNU Pth in any system-wide location (see \$PATH). dnl _AC_PTH_ERROR([dnl
Please specify the correct path to either a GNU Pth installation tree dnl Unable to locate GNU Pth under $with_pth.
(use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in dnl Please specify the correct path to either a GNU Pth installation tree
the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a dnl (use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in
path to a pth-X.Y.Z/ directory; but make sure the package is already dnl the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a
built, i.e., the "configure; make" step was already performed there).]) dnl path to a pth-X.Y.Z/ directory; but make sure the package is already
fi dnl built, i.e., the "configure; make" step was already performed there).])
fi dnl else
dnl _AC_PTH_ERROR([dnl
dnl Unable to locate GNU Pth in any system-wide location (see \$PATH).
dnl Please specify the correct path to either a GNU Pth installation tree
dnl (use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in
dnl the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a
dnl path to a pth-X.Y.Z/ directory; but make sure the package is already
dnl built, i.e., the "configure; make" step was already performed there).])
dnl fi
dnl fi
dnl # dnl #
dnl # Check whether the found version is sufficiently new dnl # Check whether the found version is sufficiently new
dnl # dnl #
@ -392,6 +394,7 @@ if test ".$with_pth" != .no; then
_AC_PTH_VERBOSE([ o PTH_LDFLAGS=\"$PTH_LDFLAGS\"]) _AC_PTH_VERBOSE([ o PTH_LDFLAGS=\"$PTH_LDFLAGS\"])
_AC_PTH_VERBOSE([ o PTH_LIBS=\"$PTH_LIBS\"]) _AC_PTH_VERBOSE([ o PTH_LIBS=\"$PTH_LIBS\"])
fi fi
fi
if test ".$with_pth" != .no; then if test ".$with_pth" != .no; then
AC_MSG_RESULT([version $_pth_version, $_pth_type under $_pth_location]) AC_MSG_RESULT([version $_pth_version, $_pth_type under $_pth_location])
ifelse([$5], , :, [$5]) ifelse([$5], , :, [$5])
@ -400,4 +403,3 @@ else
ifelse([$6], , :, [$6]) ifelse([$6], , :, [$6])
fi fi
]) ])