# # patch "ChangeLog" # from [6886692129aed899cd387044fc87e7c6cbe2ca56] # to [af7b9356c43a5cf308847ceea68acde9f213f98f] # # patch "Makefile.am" # from [aeaf86e5a6e10673c3bf421e423ade7831db2766] # to [5d0b0887a0e4e41a42e3deb7f013179fcb5c7ad1] # ======================================================================== --- ChangeLog 6886692129aed899cd387044fc87e7c6cbe2ca56 +++ ChangeLog af7b9356c43a5cf308847ceea68acde9f213f98f @@ -1,5 +1,8 @@ 2005-12-02 Matthew Gregan + * Makefile.am: Make Win32 build link against shfolder.lib to get + SHGetFolderPathA on older Windows platforms (we had previously + been relying on it to be available in shell32.lib) . * packet.cc (feed_packet_consumer::feed_packet_consumer, extract_packets): Move duplicated sets of regexs for key IDs, certs, etc. into constants.cc. ======================================================================== --- Makefile.am aeaf86e5a6e10673c3bf421e423ade7831db2766 +++ Makefile.am 5d0b0887a0e4e41a42e3deb7f013179fcb5c7ad1 @@ -297,8 +297,8 @@ if WIN32_PLATFORM libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES) - monotone_LDADD += -lws2_32 -lintl -liconv -liphlpapi - unit_tests_LDADD += -lws2_32 -lintl -liconv -liphlpapi + monotone_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi + unit_tests_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi lib3rdparty_a_CPPFLAGS += -DWIN32 -DBOTAN_EXT_ENTROPY_SRC_CAPI -DBOTAN_EXT_ENTROPY_SRC_WIN32 lib3rdparty_a_SOURCES += botan/es_capi.cpp botan/es_win32.cpp else