f24b743fde
- fix system png include path - change !gtk2 IDL lib to BUILD_DEPEND - bump package name - always use own nspr with help and ok from wilfried@
52 lines
1.7 KiB
Plaintext
52 lines
1.7 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.9 2005/01/11 04:26:45 kurt Exp $
|
|
--- configure.in.orig Thu Dec 11 18:30:36 2003
|
|
+++ configure.in Thu Jan 6 11:08:01 2005
|
|
@@ -1286,12 +1286,11 @@ case "$target" in
|
|
DLL_SUFFIX=".so.1.0"
|
|
DSO_CFLAGS=''
|
|
DSO_PIC_CFLAGS='-fPIC'
|
|
- DSO_LDOPTS='-shared -h $@'
|
|
- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
|
|
- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
|
|
- if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
|
|
- DSO_LDOPTS="-Bshareable /usr/lib/c++rt0.o"
|
|
- fi
|
|
+ DSO_LDOPTS='-shared -fPIC'
|
|
+ MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
|
|
+ MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
|
+ MKSHLIB_FORCE_ALL=''
|
|
+ MKSHLIB_UNFORCE_ALL=''
|
|
if test "$LIBRUNPATH"; then
|
|
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
|
|
fi
|
|
@@ -2159,9 +2158,8 @@ then
|
|
AC_DEFINE(_THREAD_SAFE)
|
|
dnl -pthread links in -lc_r, so don't specify it explicitly.
|
|
if test "$ac_cv_have_dash_pthread" = "yes"; then
|
|
- _PTHREAD_LDFLAGS=""
|
|
- else
|
|
- _PTHREAD_LDFLAGS="-lc_r"
|
|
+ _PTHREAD_LDFLAGS="-pthread"
|
|
+ LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
|
|
fi
|
|
;;
|
|
|
|
@@ -3038,7 +3036,7 @@ _SAVE_LIBS=$LIBS
|
|
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
|
|
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
|
|
if test -n "${PNG_DIR}"; then
|
|
- CFLAGS="-I${PNG_DIR}/include $CFLAGS"
|
|
+ CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS"
|
|
LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
|
|
fi
|
|
if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
|
|
@@ -3068,7 +3066,7 @@ LDFLAGS=$_SAVE_LDFLAGS
|
|
LIBS=$_SAVE_LIBS
|
|
|
|
if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
|
|
- PNG_CFLAGS="-I${PNG_DIR}/include"
|
|
+ PNG_CFLAGS="-I${PNG_DIR}/include/libpng"
|
|
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
|
|
fi
|
|
|