Do not run configure twice; spotted by espie@

This commit is contained in:
ajacoutot 2014-09-13 16:23:04 +00:00
parent 98c2dcbeed
commit be773ba43f
2 changed files with 36 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2014/09/03 10:24:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2014/09/13 16:23:04 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ V= 2.12.9
DISTNAME= ptlib-${V}
EXTRACT_SUFX= .tar.bz2
SUBST_VARS= V
REVISION= 3
REVISION= 4
SHARED_LIBS= pt 7.0

View File

@ -0,0 +1,34 @@
$OpenBSD: patch-Makefile,v 1.1 2014/09/13 16:23:04 ajacoutot Exp $
--- Makefile.orig Sat Sep 13 18:17:31 2014
+++ Makefile Sat Sep 13 18:17:47 2014
@@ -107,30 +107,7 @@ sterile: clean
fi
$(firstword $(CONFIG_FILES)) : $(CONFIGURE) $(CONFIG_IN_FILES)
- PTLIBDIR=$(ENV_PTLIBDIR) $(CONFIGURE) $(CFG_ARGS)
touch $(CONFIG_FILES)
-
-ifeq ($(shell which $(AUTOCONF) > /dev/null && \
- which $(ACLOCAL) > /dev/null && \
- test `autoconf --version | sed -n "s/autoconf.*2.\\([0-9]*\\)/\\1/p"` -ge 68 \
- ; echo $$?),0)
-
-$(CONFIGURE): $(CONFIGURE).ac $(PTLIBDIR)/make/*.m4 $(ACLOCAL).m4
- $(AUTOCONF)
-
-$(ACLOCAL).m4:
- $(ACLOCAL)
-
-else # autoconf
-
-$(CONFIGURE): $(CONFIGURE).ac
- @echo ---------------------------------------------------------------------
- @echo The configure script requires updating but autoconf not is installed.
- @echo Either install autoconf v3.65 or later or execute the command:
- @echo touch $@
- @echo ---------------------------------------------------------------------
-
-endif # autoconf good
$(foreach pair,$(PAIRS),$(eval $(pair)))