# # # delete "mtn_cvs/botan" # # delete "mtn_cvs/botan/md5.cpp" # # delete "mtn_cvs/botan/md5.h" # # patch "commands.cc" # from [3fa1f3b2a44dce9aa8d45363ed8be5b71e9c53e9] # to [798a219f8b84544dffd3319e7695da571d0dc81c] # # patch "mtn_cvs/Makefile.am" # from [4b38ad07c4e54a7c470ed4425bdb03d7237b5fb4] # to [597b916acf903871c85509a3ba0dc63922f481ee] # ============================================================ --- commands.cc 3fa1f3b2a44dce9aa8d45363ed8be5b71e9c53e9 +++ commands.cc 798a219f8b84544dffd3319e7695da571d0dc81c @@ -498,12 +498,8 @@ namespace commands { return split_into_words(utf8(path, origin::user)); } -#ifndef LIBMTN_COMPILE -#endif -#ifndef LIBMTN_COMPILE } -#endif // Local Variables: // mode: C++ // fill-column: 76 ============================================================ --- mtn_cvs/Makefile.am 4b38ad07c4e54a7c470ed4425bdb03d7237b5fb4 +++ mtn_cvs/Makefile.am 597b916acf903871c85509a3ba0dc63922f481ee @@ -1,11 +1,12 @@ -AM_CXXFLAGS=-I. -I.. -DLIBMTN_COMPILE -I../lua +AM_CXXFLAGS=-I. -I.. -DLIBMTN_COMPILE -I../lua $(intl_CFLAGS) $(pcre_CFLAGS) $(botan_CFLAGS) \ + $(lua_CFLAGS) $(idn_CFLAGS) noinst_LIBRARIES=libmtn.a libmtn_a_SOURCES=../netxx_pipe.cc ../sanity.cc ../ui.cc \ ../transforms.cc ../vocab.cc ../paths.cc ../charset.cc \ ../simplestring_xform.cc ../constants.cc ../xdelta.cc \ - ../commands.cc ../basic_io.cc botan/md5.cpp piece_table.cc \ + ../commands.cc ../basic_io.cc piece_table.cc \ ../mtn-sanity.cc ../package_revision.cc ../option.cc \ ../file_io.cc ../ssh_agent.cc ../specialized_lexical_cast.cc \ ../gzip.cc ../lua.cc ../globish.cc ../pcrewrap.cc