55 lines
2.0 KiB
Plaintext
55 lines
2.0 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.4 2006/12/04 09:47:54 jolan Exp $
|
|
--- configure.in.orig Sat Oct 28 06:29:25 2006
|
|
+++ configure.in Sat Nov 18 21:52:21 2006
|
|
@@ -1317,10 +1317,10 @@ 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`
|
|
-SUNBIRD_VERSION=`cat $topsrcdir/calendar/sunbird/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`
|
|
+SUNBIRD_VERSION=`cat ./calendar/sunbird/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)
|
|
@@ -1931,7 +1931,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'
|
|
@@ -3804,7 +3804,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
|
|
@@ -3834,7 +3834,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
|
|
|
|
@@ -4260,7 +4260,7 @@ minimo)
|
|
ENABLE_TESTS=
|
|
MINIMO=1
|
|
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
|
|
- MOZ_APP_VERSION=`cat $topsrcdir/minimo/config/version.txt`
|
|
+ MOZ_APP_VERSION=`cat ./minimo/config/version.txt`
|
|
MOZ_COMPOSER=
|
|
MOZ_ENABLE_CANVAS=
|
|
MOZ_ENABLE_POSTSCRIPT=
|