[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.0-rc1-139-g4b8a4d2

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 4b8a4d2bfec1c1481e540d7898b3ccfcd26856b9
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat May 10 09:56:04 2008 +0200

    Reverted patch to mark stack executable.
    It hasn't been doing anything for a while (the functional part of it probably got lost in a merge conflict),
    and nobody has complained, so it's probably not needed anymore.
    
    This reverts commit f1b7d780b67621a9c0543656085384bc4908d9d3.
    
    Conflicts:
    
    	configure
    	loader/Makefile.in

diff --git a/configure b/configure
index fc2e224..fe2f454 100755
--- a/configure
+++ b/configure
@@ -763,7 +763,6 @@ AUDIOIOLIBS
 FONTCONFIGINCL
 EXTRACFLAGS
 BUILTINFLAG
-EXECSTACK
 LDPATH
 CRTLIBS
 SOCKETLIBS
@@ -16477,67 +16476,6 @@ echo "${ECHO_T}$ac_cv_c_builtin_wchar_ctype" >&6; }
   fi
 fi
 
-EXECSTACK=""
-
-saved_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -z execstack"
-{ echo "$as_me:$LINENO: checking for -z execstack" >&5
-echo $ECHO_N "checking for -z execstack... $ECHO_C" >&6; }
-if test "${ac_cv_z_execstack+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-int main(void) {return 0;}
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_z_execstack=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_z_execstack=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_z_execstack" >&5
-echo "${ECHO_T}$ac_cv_z_execstack" >&6; }
-if test $ac_cv_z_execstack
-then
-  EXECSTACK="-z execstack"
-fi
-LDFLAGS="$saved_LDFLAGS"
-
 
 { echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5
 echo $ECHO_N "checking how to define a function in assembly code... $ECHO_C" >&6; }
@@ -23592,7 +23530,6 @@ AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim
 FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim
 EXTRACFLAGS!$EXTRACFLAGS$ac_delim
 BUILTINFLAG!$BUILTINFLAG$ac_delim
-EXECSTACK!$EXECSTACK$ac_delim
 LDPATH!$LDPATH$ac_delim
 CRTLIBS!$CRTLIBS$ac_delim
 SOCKETLIBS!$SOCKETLIBS$ac_delim
@@ -23605,7 +23542,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 5053e6f..618785f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1252,18 +1252,6 @@ then
   fi
 fi
 
-AC_SUBST(EXECSTACK,"")
-saved_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -z execstack"
-AC_CACHE_CHECK([for -z execstack], ac_cv_z_execstack,
-   AC_TRY_LINK([],[int main(void) {return 0;}],
-               ac_cv_z_execstack=yes,ac_cv_z_execstack=no))
-if test $ac_cv_z_execstack
-then
-  EXECSTACK="-z execstack"
-fi
-LDFLAGS="$saved_LDFLAGS"
-
 dnl **** Check how to define a function in assembly code ****
 
 AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def,

-- 
Debian Wine packaging