36 lines
2.1 KiB
Plaintext
36 lines
2.1 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.16 2012/11/29 20:18:21 brad Exp $
|
|
--- configure.ac.orig Sat Jun 9 13:30:18 2012
|
|
+++ configure.ac Tue Nov 27 05:19:25 2012
|
|
@@ -804,9 +804,7 @@ AC_ARG_ENABLE([optimizations],
|
|
[AS_HELP_STRING([--disable-optimizations], [Don't try to guess what optimization to enable])],
|
|
[], [test x"$enable_debug" != x"no" && enable_optimizations="no"])
|
|
AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], [test x"$enable_optimizations" = x"no"])
|
|
-if test x"$enable_optimizations" = x"no"; then
|
|
- DEFAULT_OCFLAGS='$(O0_CFLAGS)'
|
|
-else
|
|
+if test x"$enable_optimizations" = x"yes"; then
|
|
dnl For multi-pass compilation: never when cross-compiling
|
|
if test x"$cross_compiling" != x"yes"; then
|
|
if test x"$GCC" = x"yes"; then
|
|
@@ -830,7 +828,7 @@ AC_SUBST(O3_CFLAGS)
|
|
AC_SUBST(PASS1_CFLAGS)
|
|
AC_SUBST(PASS2_CFLAGS)
|
|
|
|
-test x"$DEFAULT_OCFLAGS" = x"" && DEFAULT_OCFLAGS='$(O3_CFLAGS)'
|
|
+test x"$DEFAULT_OCFLAGS" = x"" && DEFAULT_OCFLAGS=''
|
|
AC_SUBST(DEFAULT_OCFLAGS)
|
|
|
|
if test x"$arch_x86" != x"no" && test x"$enable_macosx_universal" = x"no"; then
|
|
@@ -979,9 +977,9 @@ t q
|
|
b
|
|
:q
|
|
q"
|
|
-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libX11.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\"`"
|
|
+x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libX11.$acl_cv_shlibext"* 2>/dev/null | sed 1q`"
|
|
AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.$acl_cv_shlibext}", [The soname of libX11, needed for dlopen()])
|
|
-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\"`"
|
|
+x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"* 2>/dev/null | sed 1q`"
|
|
AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.$acl_cv_shlibext}", [The soname of libXv, needed for dlopen()])
|
|
|
|
dnl _FILE_OFFSET_BITS (AC_SYS_LARGEFILE; ac_cv_sys_file_offset_bits)
|