44 lines
1.6 KiB
Plaintext
44 lines
1.6 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.9 2006/09/18 15:18:36 steven Exp $
|
|
--- configure.in.orig Fri Apr 21 22:50:21 2006
|
|
+++ configure.in Mon Sep 18 16:02:12 2006
|
|
@@ -1287,9 +1287,9 @@ dnl Get mozilla version from central mil
|
|
MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
|
|
|
|
dnl Get version of various core apps from the version files.
|
|
-FIREFOX_VERSION=`cat $topsrcdir/browser/config/version.txt`
|
|
-THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt`
|
|
-SEAMONKEY_VERSION=`cat $topsrcdir/xpfe/bootstrap/version.txt`
|
|
+FIREFOX_VERSION=`cat ./browser/config/version.txt`
|
|
+THUNDERBIRD_VERSION=`cat ./mail/config/version.txt`
|
|
+SEAMONKEY_VERSION=`cat ./xpfe/bootstrap/version.txt`
|
|
|
|
AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
|
|
AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
|
|
@@ -1859,7 +1859,7 @@ case "$target" in
|
|
;;
|
|
|
|
*-openbsd*)
|
|
- DLL_SUFFIX=".so.1.0"
|
|
+ DLL_SUFFIX=".so.${SO_VERSION}"
|
|
DSO_CFLAGS=''
|
|
DSO_PIC_CFLAGS='-fPIC'
|
|
DSO_LDOPTS='-shared -fPIC'
|
|
@@ -3643,7 +3643,7 @@ _SAVE_LIBS=$LIBS
|
|
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
|
|
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
|
|
if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; 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
|
|
@@ -3673,7 +3673,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
|
|
|