openbsd-ports/x11/xscreensaver/patches/patch-configure
2010-12-06 17:37:59 +00:00

65 lines
2.2 KiB
Plaintext

$OpenBSD: patch-configure,v 1.14 2010/12/06 17:38:00 jasper Exp $
--- configure.orig Wed Sep 15 12:10:52 2010
+++ configure Mon Dec 6 17:45:57 2010
@@ -9879,7 +9879,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9950,7 +9950,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10023,7 +10023,7 @@ fi
fi
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- LIBS="$LIBS -lintl";
+ LIBS="$LIBS -liconv -lintl";
fi
if test "$gt_cv_func_dgettext_libc" = "yes" \
@@ -17453,18 +17453,18 @@ $as_echo "adding \"$osx_crud\" to GL_LIBS" >&6; }
fi
- # Some versions of MesaGL are compiled to require -lpthread.
- # So if the Mesa headers exist, and -lpthread exists, then always
- # link -lpthread after the Mesa libs (be they named -lGL or -lMesaGL.)
+ # Some versions of MesaGL are compiled to require -pthread.
+ # So if the Mesa headers exist, and -pthread exists, then always
+ # link -pthread after the Mesa libs (be they named -lGL or -lMesaGL.)
#
if test "$ac_have_mesa_gl" = yes; then
- { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17524,7 +17524,7 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
- GL_LIBS="-lpthread"
+ GL_LIBS="-pthread"
fi
fi