91 lines
2.9 KiB
Plaintext
91 lines
2.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.7 2008/12/29 19:17:36 rui Exp $
|
|
--- configure.orig Sun Dec 28 00:27:47 2008
|
|
+++ configure Sun Dec 28 00:36:56 2008
|
|
@@ -4862,7 +4862,7 @@ fi
|
|
LTDLINCL='-I${top_srcdir}/''libltdl'
|
|
else
|
|
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
|
|
- LIBLTDL="-lltdl"
|
|
+ LIBLTDL="-L$with_ltdl_lib -lltdl"
|
|
LTDLINCL=
|
|
fi
|
|
# For backwards non-gettext consistent compatibility...
|
|
@@ -8874,7 +8874,6 @@ bsdi[45]*)
|
|
need_version=no
|
|
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
soname_spec='${libname}${release}${shared_ext}$major'
|
|
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
|
sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
|
|
@@ -20336,13 +20335,13 @@ fi
|
|
done
|
|
|
|
|
|
- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
|
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
|
|
+ { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
|
|
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
|
|
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -20399,7 +20398,7 @@ fi
|
|
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
|
|
if test $ac_cv_lib_pthread_pthread_create = yes; then
|
|
CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
|
|
- LIBS="$LIBS -lpthread"
|
|
+ LIBS="$LIBS -pthread"
|
|
else
|
|
{ echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
|
|
echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
|
|
@@ -20649,7 +20648,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lresolv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -20709,8 +20707,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
|
|
#define HAVE_LIBRESOLV 1
|
|
_ACEOF
|
|
|
|
- LIBS="-lresolv $LIBS"
|
|
-
|
|
fi
|
|
|
|
|
|
@@ -20867,7 +20863,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lssl $LIBS"
|
|
+LIBS="-lcrypto -lssl $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -23411,7 +23407,7 @@ _ACEOF
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
-
|
|
+#include <unistd.h>
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
@@ -23478,7 +23474,7 @@ _ACEOF
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
-
|
|
+#include <unistd.h>
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|