1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Add patch to fix build when LOCALBASE != /usr/local. The configure

script checked explicitly in /usr/local for pwlib. This patch has
also been sent upstream.

Patch does not affect build when LOCALBASE == /usr/local, so no
PORTREVISION bump required.

Approved by:	Jean-Baptiste Quenot <jbq@caraldi.com> (maintainer)
This commit is contained in:
Tim Bishop 2007-01-07 18:34:18 +00:00
parent f486ae8d4b
commit 9e949f5564
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=181698
2 changed files with 48 additions and 0 deletions

View File

@ -0,0 +1,24 @@
--- ./configure.ac.orig Tue Feb 21 00:47:28 2006
+++ ./configure.ac Sun Jan 7 13:01:14 2007
@@ -60,6 +60,11 @@
AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make/)
+ else
+ AC_CHECK_FILE(${prefix}/include/ptlib.h, HAS_PTLIB=1)
+ if test "${HAS_PTLIB:-unset}" != "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , ${prefix}/bin)
+ fi
fi
fi
fi
@@ -84,6 +89,9 @@
fi
if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
+fi
+if test "x$PWLIBDIR" = "x${prefix}"; then
+ PWLIBDIR="${prefix}/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"

View File

@ -0,0 +1,24 @@
--- ./configure.ac.orig Tue Feb 21 00:47:28 2006
+++ ./configure.ac Sun Jan 7 13:01:14 2007
@@ -60,6 +60,11 @@
AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make/)
+ else
+ AC_CHECK_FILE(${prefix}/include/ptlib.h, HAS_PTLIB=1)
+ if test "${HAS_PTLIB:-unset}" != "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , ${prefix}/bin)
+ fi
fi
fi
fi
@@ -84,6 +89,9 @@
fi
if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib/"
+fi
+if test "x$PWLIBDIR" = "x${prefix}"; then
+ PWLIBDIR="${prefix}/share/pwlib/"
fi
echo "PWLib prefix set to.... $PWLIBDIR"