openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File patch of Package monotone

--- monotone-0.29/configure	2006-08-21 13:46:30.000000000 +1200
+++ monotone-0.29.work/configure	2008-08-15 13:41:55.000000000 +1200
@@ -14805,8 +14805,6 @@
 
 
 
-
-
  found=no
  suffixes=${BOOST_SUFFIX:-"none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt-s"}
  OLD_LIBS="$LIBS"
@@ -14814,15 +14812,15 @@
  do
     test "x${BOOST_SUFFIX}" = "xnone" && BOOST_SUFFIX=
     if test "x${BOOST_LIBDIR}" != x; then
-      lib="${BOOST_LIBDIR}/libboost_unit_test_framework${BOOST_SUFFIX}.a"
+      lib="${BOOST_LIBDIR}/libboost_program_options${BOOST_SUFFIX}.a"
     else
-      lib="-lboost_unit_test_framework${BOOST_SUFFIX}"
+      lib="-lboost_program_options${BOOST_SUFFIX}"
     fi
 
     LIBS="$lib $OLD_LIBS"
-    cv=`echo "ac_cv_boost_lib_unit_test_framework${BOOST_SUFFIX}_${BOOST_LIBDIR}" | $as_tr_sh`
-    { echo "$as_me:$LINENO: checking for the boost_unit_test_framework${BOOST_SUFFIX} library" >&5
-echo $ECHO_N "checking for the boost_unit_test_framework${BOOST_SUFFIX} library... $ECHO_C" >&6; }
+    cv=`echo "ac_cv_boost_lib_program_options${BOOST_SUFFIX}_${BOOST_LIBDIR}" | $as_tr_sh`
+    { echo "$as_me:$LINENO: checking for the boost_program_options${BOOST_SUFFIX} library" >&5
+echo $ECHO_N "checking for the boost_program_options${BOOST_SUFFIX} library... $ECHO_C" >&6; }
 if { as_var=$cv; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14833,12 +14831,18 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-      #include <boost/test/unit_test_suite.hpp>
-      #include <boost/test/test_tools.hpp>
-      using boost::unit_test_framework::test_suite;
-      test_suite * init_unit_test_suite(int argc, char * argv[])
-      { return NULL; }
+      #include <boost/program_options.hpp>
+      using namespace boost::program_options;
+
+int
+main ()
+{
 
+      options_description od("foo"); od.add_options()("test", "a test option");
+
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -14895,35 +14899,19 @@
  done
  LIBS="$OLD_LIBS"
  if test $found = yes; then
-
-
-if true; then
-  BUILD_UNIT_TESTS_TRUE=
-  BUILD_UNIT_TESTS_FALSE='#'
-else
-  BUILD_UNIT_TESTS_TRUE='#'
-  BUILD_UNIT_TESTS_FALSE=
-fi
-
-  BOOST_UNITTEST="$lib"
-else
-
-
-if false; then
-  BUILD_UNIT_TESTS_TRUE=
-  BUILD_UNIT_TESTS_FALSE='#'
+  BOOSTLIBS="$lib $BOOSTLIBS"
 else
-  BUILD_UNIT_TESTS_TRUE='#'
-  BUILD_UNIT_TESTS_FALSE=
-fi
-
+  { { echo "$as_me:$LINENO: error: the boost_program_options library is required
+See \`config.log' for more details." >&5
+echo "$as_me: error: the boost_program_options library is required
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 
 
 
-
  found=no
  suffixes=${BOOST_SUFFIX:-"none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt-s"}
  OLD_LIBS="$LIBS"
@@ -14931,15 +14919,15 @@
  do
     test "x${BOOST_SUFFIX}" = "xnone" && BOOST_SUFFIX=
     if test "x${BOOST_LIBDIR}" != x; then
-      lib="${BOOST_LIBDIR}/libboost_program_options${BOOST_SUFFIX}.a"
+      lib="${BOOST_LIBDIR}/libboost_unit_test_framework${BOOST_SUFFIX}.a"
     else
-      lib="-lboost_program_options${BOOST_SUFFIX}"
+      lib="-lboost_unit_test_framework${BOOST_SUFFIX}"
     fi
 
     LIBS="$lib $OLD_LIBS"
-    cv=`echo "ac_cv_boost_lib_program_options${BOOST_SUFFIX}_${BOOST_LIBDIR}" | $as_tr_sh`
-    { echo "$as_me:$LINENO: checking for the boost_program_options${BOOST_SUFFIX} library" >&5
-echo $ECHO_N "checking for the boost_program_options${BOOST_SUFFIX} library... $ECHO_C" >&6; }
+    cv=`echo "ac_cv_boost_lib_unit_test_framework${BOOST_SUFFIX}_${BOOST_LIBDIR}" | $as_tr_sh`
+    { echo "$as_me:$LINENO: checking for the boost_unit_test_framework${BOOST_SUFFIX} library" >&5
+echo $ECHO_N "checking for the boost_unit_test_framework${BOOST_SUFFIX} library... $ECHO_C" >&6; }
 if { as_var=$cv; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14950,18 +14938,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-      #include <boost/program_options.hpp>
-      using namespace boost::program_options;
-
-int
-main ()
-{
-
-      options_description od("foo"); od.add_options()("test", "a test option");
+      #include <boost/test/unit_test_suite.hpp>
+      #include <boost/test/test_tools.hpp>
+      using boost::unit_test_framework::test_suite;
+      test_suite * init_unit_test_suite(int argc, char * argv[])
+      { return NULL; }
 
-  ;
-  return 0;
-}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -15016,17 +14998,37 @@
        break
     fi
  done
- LIBS="$OLD_LIBS"
- if test $found = yes; then
-  BOOSTLIBS="$lib $BOOSTLIBS"
+
+if test $found = yes; then
+
+
+if true; then
+  BUILD_UNIT_TESTS_TRUE=
+  BUILD_UNIT_TESTS_FALSE='#'
 else
-  { { echo "$as_me:$LINENO: error: the boost_program_options library is required
-See \`config.log' for more details." >&5
-echo "$as_me: error: the boost_program_options library is required
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  BUILD_UNIT_TESTS_TRUE='#'
+  BUILD_UNIT_TESTS_FALSE=
 fi
 
+  BOOST_UNITTEST="$lib"
+else
+
+
+if false; then
+  BUILD_UNIT_TESTS_TRUE=
+  BUILD_UNIT_TESTS_FALSE='#'
+else
+  BUILD_UNIT_TESTS_TRUE='#'
+  BUILD_UNIT_TESTS_FALSE=
+fi
+
+fi
+
+
+
+
+
+

Places

File patch of Package monotone

Places