13ea65e71f
Fix: first check our bool variable, then make some calculations if it's false. Not the other way around (upstream git commit 41090dfe3756396a8b4496f732ab8493aa51fe6c) Fix: disabling protocol obfuscation broke Kad and triggered assertions (upstream git commit ec2e66216738f92724a37fa030a79734e0e8b1ba) Fix: disable the partfile importer's 'Add' button on the remote gui unless using a localhost connection (upstream git commit 004f3929d91e4b81f47235060d86686fff13e2d3) Fix: "Prompt on exit" preference (upstream git commit aea8d002b6446dcaf38db4d4ab222fcebce60948) Fix: require restart when protocol obfuscation setting gets changed (upstream git commit ec2e66216738f92724a37fa030a79734e0e8b1ba) And fix libX11 '-lX11' linkage.
39 lines
1.3 KiB
Plaintext
39 lines
1.3 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.3 2011/12/11 18:31:13 dcoppa Exp $
|
|
--- configure.in.orig Fri Nov 11 21:59:14 2011
|
|
+++ configure.in Fri Dec 9 20:14:19 2011
|
|
@@ -172,7 +172,7 @@ MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-g
|
|
WX_DETECT_STANDARD_OPTION_VALUES
|
|
|
|
# We also need wxBase
|
|
- WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs adv,core,net`
|
|
+ WX_LIBS="`$WX_CONFIG_WITH_ARGS --libs adv,core,net` -lX11"
|
|
WXBASE_LIBS=`$WX_CONFIG_WITH_ARGS --libs net`
|
|
WXBASE_CPPFLAGS="$WX_CPPFLAGS -DwxUSE_GUI=0"
|
|
|
|
@@ -236,7 +236,7 @@ AC_LANG_POP([C++])
|
|
])
|
|
|
|
# Ok, we have all needed libs, now checking for other stuff
|
|
-AS_IF([test "$LEX" = "flex"], [MULE_CHECK_FLEX_EXTENDED], [HAVE_FLEX_EXTENDED=no])
|
|
+MULE_CHECK_FLEX_EXTENDED
|
|
|
|
# Flush standard test results for speeding cache
|
|
AC_CACHE_SAVE
|
|
@@ -325,7 +325,6 @@ MULE_CHECK_NLS
|
|
|
|
# Check for bfd.h (to have proper backtraces without using wxExecute)
|
|
MULE_CHECK_BFD
|
|
-MULE_CHECK_EXECINFO
|
|
|
|
# Flush standard test results for speeding cache
|
|
AC_CACHE_SAVE
|
|
@@ -336,7 +335,7 @@ MULE_COMPILATION_FLAGS
|
|
|
|
# autoconf >= 2.60 already defines ${docdir}, but we always need it.
|
|
AC_MSG_CHECKING([for docdir])
|
|
-AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
|
|
+AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/${PACKAGE_TARNAME}"])
|
|
AC_SUBST([docdir])dnl
|
|
AC_MSG_RESULT([$docdir])
|
|
|