mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-10 02:45:11 +00:00
42 lines
1.2 KiB
Plaintext
42 lines
1.2 KiB
Plaintext
--- srclib/apr/buildconf.orig Tue Jun 14 14:11:15 2005
|
|
+++ srclib/apr/buildconf Sun Sep 24 15:17:36 2006
|
|
@@ -23,7 +23,7 @@
|
|
#
|
|
build/buildcheck.sh || exit 1
|
|
|
|
-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
|
|
+libtoolize="${LIBTOOLIZE}"
|
|
if [ "x$libtoolize" = "x" ]; then
|
|
echo "libtoolize not found in path"
|
|
exit 1
|
|
@@ -52,7 +52,7 @@
|
|
# Expecting the code above to be very portable, but just in case...
|
|
if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
|
|
ltpath=`dirname $libtoolize`
|
|
- ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
|
|
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
|
|
fi
|
|
fi
|
|
|
|
@@ -61,7 +61,7 @@
|
|
exit 1
|
|
fi
|
|
|
|
-echo "buildconf: Using libtool.m4 at ${ltfile}."
|
|
+echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
|
|
|
|
cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
|
|
|
|
@@ -87,8 +87,11 @@
|
|
# Remove autoconf 2.5x's cache directory
|
|
rm -rf autom4te*.cache
|
|
|
|
+
|
|
+if [ "x${FULLBUILD}" = "xon" ] ; then
|
|
echo "Generating 'make' outputs ..."
|
|
build/gen-build.py make
|
|
+fi
|
|
|
|
# Create RPM Spec file
|
|
if [ -f `which cut` ]; then
|