mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-29 05:38:00 +00:00
82 lines
2.3 KiB
Plaintext
82 lines
2.3 KiB
Plaintext
|
|
$FreeBSD$
|
|
|
|
--- configure.orig Wed Jun 13 19:39:30 2001
|
|
+++ configure Wed Aug 1 19:33:18 2001
|
|
@@ -10018,6 +10018,12 @@
|
|
linux*)
|
|
G_MODULE_LDFLAGS='-rdynamic'
|
|
;;
|
|
+ freebsd*)
|
|
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
+ if test $objformat = "elf"; then
|
|
+ G_MODULE_LDFLAGS='-Wl,-E'
|
|
+ fi
|
|
+ ;;
|
|
esac
|
|
LIBS_orig="$LIBS"
|
|
LDFLAGS_orig="$LDFLAGS"
|
|
@@ -10488,8 +10494,8 @@
|
|
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
|
fi
|
|
;;
|
|
- *-freebsd2.2*)
|
|
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
|
|
+ *-freebsd*)
|
|
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
|
|
|
|
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
|
|
# -mthreads flag.
|
|
@@ -10569,13 +10575,13 @@
|
|
fi
|
|
;;
|
|
*)
|
|
- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
|
|
+ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do
|
|
if test x"$thread_lib" = x; then
|
|
add_thread_lib=""
|
|
IN=""
|
|
else
|
|
- add_thread_lib="-l$thread_lib"
|
|
- IN=" in -l$thread_lib"
|
|
+ add_thread_lib="$thread_lib"
|
|
+ IN=" in $thread_lib"
|
|
fi
|
|
if test x"$have_threads" = xposix; then
|
|
defattr=0
|
|
@@ -11114,6 +11120,7 @@
|
|
if test "$cross_compiling" = yes; then
|
|
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
|
else
|
|
+# LIBS="-lgiconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 11119 "configure"
|
|
#include "confdefs.h"
|
|
@@ -11481,14 +11488,14 @@
|
|
#
|
|
# Check for libiconv
|
|
#
|
|
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
|
|
-echo "configure:11486: checking for libiconv_open in -liconv" >&5
|
|
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
|
|
+echo "configure:11486: checking for libiconv_open in -lgiconv" >&5
|
|
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-liconv $LIBS"
|
|
+LIBS="-lgiconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 11494 "configure"
|
|
#include "confdefs.h"
|
|
@@ -11528,7 +11535,7 @@
|
|
fi
|
|
|
|
if test "x$with_libiconv" = "xyes" ; then
|
|
- ICONV_LIBS="-liconv"
|
|
+ ICONV_LIBS="-lgiconv"
|
|
cat >> confdefs.h <<\EOF
|
|
#define USE_LIBICONV 1
|
|
EOF
|