50632a2048
- add @comment markers to keep make plist happy - remove the need for us to install the manpage. - alpha fix from merdely@ - workaround for Paths.pyc needing to be re-generated - from wcmaier@ (a discussion has been started with upstream to remedy this bit) feedback and ok merdely@
38 lines
1.2 KiB
Plaintext
38 lines
1.2 KiB
Plaintext
$OpenBSD: patch-configure,v 1.6 2008/05/15 18:30:14 okan Exp $
|
|
--- configure.orig Mon Apr 28 19:53:32 2008
|
|
+++ configure Wed May 7 12:52:54 2008
|
|
@@ -6432,6 +6432,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
extern char pcap_version[];
|
|
int main() {
|
|
int major, minor1, minor2;
|
|
+ exit(0); /* fool it, use our libpcap */
|
|
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
|
|
if (major > 0)
|
|
exit(0);
|
|
@@ -6752,7 +6753,7 @@ cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
$ac_includes_default
|
|
-#include <pcre/pcre.h>
|
|
+#include <pcre.h>
|
|
_ACEOF
|
|
rm -f conftest.$ac_objext
|
|
if { (ac_try="$ac_compile"
|
|
@@ -6947,7 +6948,7 @@ if test $have_pcre != yes ; then
|
|
else
|
|
# We only need to check for and use this if we are NOT using included pcre
|
|
|
|
-for ac_header in pcre/pcre.h
|
|
+for ac_header in pcre.h
|
|
do
|
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
@@ -7181,6 +7182,7 @@ if test "${with_liblua+set}" = set; then
|
|
*)
|
|
CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
|
|
LDFLAGS="-L$with_liblua/lib $LDFLAGS"
|
|
+ LIBLUA_LIBS="-llua"
|
|
have_lua=yes
|
|
;;
|
|
esac
|