#! /bin/sh /usr/share/dpatch/dpatch-run
## no-include-bits_atomicity.h.dpatch by Kilian Krause <kilian@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439117

@DPATCH@
diff -urNad libcommoncpp2-1.5.9~/configure libcommoncpp2-1.5.9/configure
--- libcommoncpp2-1.5.9~/configure	2007-10-02 09:23:06.000000000 +0200
+++ libcommoncpp2-1.5.9/configure	2007-10-02 09:25:46.000000000 +0200
@@ -26105,275 +26105,6 @@
 echo "${ECHO_T}$ost_cv_posix_atomic" >&6; }
   fi
 
-
-for ac_header in bits/atomicity.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- ost_cv_bits_atomicity=yes
-else
-  ost_cv_bits_atomicity=no
-fi
-
-done
-
-  if test $ost_cv_bits_atomicity = yes ; then
-      { echo "$as_me:$LINENO: checking for _Atomic_word" >&5
-echo $ECHO_N "checking for _Atomic_word... $ECHO_C" >&6; }
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <bits/atomicity.h>
-int
-main ()
-{
-
-	    _Atomic_word i = 0;
-	    __atomic_add(&i, 1);
-	    __exchange_and_add(&i, 1);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ost_cv_gcc_atomic=yes
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GCC_BITS_ATOMIC 1
-_ACEOF
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ost_cv_gcc_atomic=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      { echo "$as_me:$LINENO: result: $ost_cv_gcc_atomic" >&5
-echo "${ECHO_T}$ost_cv_gcc_atomic" >&6; }
-
-      { echo "$as_me:$LINENO: checking for __gnu_cxx::_Atomic_word" >&5
-echo $ECHO_N "checking for __gnu_cxx::_Atomic_word... $ECHO_C" >&6; }
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <bits/atomicity.h>
-int
-main ()
-{
-
-	    using namespace __gnu_cxx;
-	    _Atomic_word i = 0;
-	    __atomic_add(&i, 1);
-	    __exchange_and_add(&i, 1);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ost_cv_gcc_cxx_atomic=yes
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GCC_CXX_BITS_ATOMIC 1
-_ACEOF
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ost_cv_gcc_cxx_atomic=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      { echo "$as_me:$LINENO: result: $ost_cv_gcc_cxx_atomic" >&5
-echo "${ECHO_T}$ost_cv_gcc_cxx_atomic" >&6; }
-  fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  if test "$target" = NONE ; then
-	targetdir=""
-  else
-	targetdir="$target"
-  fi
-
-
 for ac_header in thread.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff -urNad libcommoncpp2-1.5.9~/m4/ost_pthread.m4 libcommoncpp2-1.5.9/m4/ost_pthread.m4
--- libcommoncpp2-1.5.9~/m4/ost_pthread.m4	2007-10-02 09:22:57.000000000 +0200
+++ libcommoncpp2-1.5.9/m4/ost_pthread.m4	2007-10-02 09:23:06.000000000 +0200
@@ -89,38 +89,6 @@
 	AC_MSG_RESULT($ost_cv_posix_atomic)
   fi
 
-  dnl check for gcc's bits/atomicity and the atomic functions therein
-  AC_CHECK_HEADERS([bits/atomicity.h],
-	ost_cv_bits_atomicity=yes,
-	ost_cv_bits_atomicity=no)
-  if test $ost_cv_bits_atomicity = yes ; then
-      AC_MSG_CHECKING([for _Atomic_word])
-      AC_TRY_COMPILE([#include <bits/atomicity.h>],
-	    [
-	    _Atomic_word i = 0;
-	    __atomic_add(&i, 1);
-	    __exchange_and_add(&i, 1);
-	    ],
-	    [ost_cv_gcc_atomic=yes
-	     AC_DEFINE(HAVE_GCC_BITS_ATOMIC, [1], [has gcc atomic functions])],
-	    [ost_cv_gcc_atomic=no])
-      AC_MSG_RESULT($ost_cv_gcc_atomic)
-
-      AC_MSG_CHECKING([for __gnu_cxx::_Atomic_word])
-      AC_TRY_COMPILE([#include <bits/atomicity.h>],
-	    [
-	    using namespace __gnu_cxx;
-	    _Atomic_word i = 0;
-	    __atomic_add(&i, 1);
-	    __exchange_and_add(&i, 1);
-	    ],
-	    [ost_cv_gcc_cxx_atomic=yes
-	     AC_DEFINE(HAVE_GCC_CXX_BITS_ATOMIC, [1], 
-		[has __gnu_cxx atomic functions])],
-	    [ost_cv_gcc_cxx_atomic=no])
-      AC_MSG_RESULT($ost_cv_gcc_cxx_atomic)
-  fi
-
 AC_LANG_RESTORE
 
   if test "$target" = NONE ; then