openbsd-ports/x11/xfe/patches/patch-configure
2007-10-16 14:46:46 +00:00

60 lines
2.1 KiB
Plaintext

$OpenBSD: patch-configure,v 1.2 2007/10/16 14:46:46 ajacoutot Exp $
--- configure.orig Tue Aug 28 10:47:02 2007
+++ configure Tue Oct 16 16:35:38 2007
@@ -2273,7 +2273,6 @@ _ACEOF
-CXXFLAGS="-O2"
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
@@ -7523,13 +7522,13 @@ fi
else
# Some library is needed. Try libpthread and libc_r.
- { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5
+echo $ECHO_N "checking for pthread_kill in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_kill+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
@@ -7586,8 +7585,8 @@ fi
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; }
if test $ac_cv_lib_pthread_pthread_kill = yes; then
gl_have_pthread=yes
- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+ LIBTHREAD=-pthread LTLIBTHREAD=-pthread
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
fi
if test -z "$gl_have_pthread"; then
@@ -14529,7 +14528,7 @@ LIBTHREAD!$LIBTHREAD$ac_delim
LTLIBTHREAD!$LTLIBTHREAD$ac_delim
LIBMULTITHREAD!$LIBMULTITHREAD$ac_delim
LTLIBMULTITHREAD!$LTLIBMULTITHREAD$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
INTLBISON!$INTLBISON$ac_delim
GLIBC21!$GLIBC21$ac_delim
@@ -14547,8 +14546,8 @@ INSTOBJEXT!$INSTOBJEXT$ac_delim
GENCAT!$GENCAT$ac_delim
INTLOBJS!$INTLOBJS$ac_delim
INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+INTLLIBS!$LTLIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
CXXCPP!$CXXCPP$ac_delim