# # # patch "idna/Makefile.am" # from [3d488dadb7833d0496d2172214bfaf77bcedcabd] # to [24965db46035cf019f0e553dd5e75e1b5341310f] # # patch "idna/configure.ac" # from [2a97033aff497ff3e8178b396974517b49d33bfe] # to [f5a795b9ae2fdfb941a0e7eb8d2df8268881d5dd] # # patch "lua/Makefile.am" # from [46a135c015bdaaaa9023a392a8e389b8510c0d2a] # to [f028d870f673ec484c964fd71afa603c6c067858] # # patch "lua/configure.ac" # from [95852a57ea9f647a856137459e2e4a64b60510a7] # to [cfa5945269926f8f96904dff050c9ab3376c27af] # # patch "netxx/configure.ac" # from [cd0be0962f79b2628b10d9739460595c1c3dacb6] # to [9561c7e3046c5c51bbdf0cdf7ea0190fd9c3566f] # # patch "sqlite/Makefile.am" # from [ef1193d1b936b1f03cbc90f5cc32378ffd79b735] # to [f5e33fc2a5bd1a67c59b2f7550d7df58d34d50b1] # # patch "sqlite/configure.ac" # from [a384a290bbe736d11f60880071681770d16cd3b2] # to [eb7266e0fe0ddfc25fac85f9d66a21784fa9562e] # ============================================================ --- idna/Makefile.am 3d488dadb7833d0496d2172214bfaf77bcedcabd +++ idna/Makefile.am 24965db46035cf019f0e553dd5e75e1b5341310f @@ -1,6 +1,5 @@ include_HEADERS = idna.h punycode.h stri lib_LIBRARIES = libidna.a include_HEADERS = idna.h punycode.h stringprep.h - libidna_a_SOURCES = \ gunibreak.h gunicomp.h gunidecomp.h idna.c idn-int.h nfkc.c \ profiles.c punycode.c rfc3454.c stringprep.c toutf8.c \ ============================================================ --- idna/configure.ac 2a97033aff497ff3e8178b396974517b49d33bfe +++ idna/configure.ac f5a795b9ae2fdfb941a0e7eb8d2df8268881d5dd @@ -26,6 +26,7 @@ AC_PROG_CC AC_CONFIG_FILES([Makefile]) AC_PROG_CC +AC_PROG_INSTALL AC_PROG_RANLIB AC_OUTPUT ============================================================ --- lua/Makefile.am 46a135c015bdaaaa9023a392a8e389b8510c0d2a +++ lua/Makefile.am f028d870f673ec484c964fd71afa603c6c067858 @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1 - lib_LIBRARIES = liblua.a include_HEADERS = lua.h luaconf.h lualib.h lauxlib.h liblua_a_SOURCES = \ @@ -11,8 +9,3 @@ liblua_a_SOURCES = \ lparser.h lstate.cc lstate.h lstring.cc lstring.h lstrlib.cc \ ltable.cc ltable.h ltablib.cc ltests.cc ltm.cc ltm.h \ lundump.cc lundump.h lvm.cc lvm.h lzio.cc lzio.h - -liblua_a_CPPFLAGS = -liblua_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) -liblua_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS) - ============================================================ --- lua/configure.ac 95852a57ea9f647a856137459e2e4a64b60510a7 +++ lua/configure.ac cfa5945269926f8f96904dff050c9ab3376c27af @@ -18,9 +18,15 @@ AC_INIT(lua, XX, address@hidden AC_PREREQ(2.58) AC_INIT(lua, XX, address@hidden) -AM_INIT_AUTOMAKE AC_CONFIG_AUX_DIR([..]) AC_CONFIG_MACRO_DIR([../m4]) + +AM_INIT_AUTOMAKE([1.7.1 foreign no-dist no-define]) AC_CONFIG_SRCDIR([lua.h]) AC_CONFIG_FILES([Makefile]) + +AC_PROG_CXX +AC_PROG_INSTALL +AC_PROG_RANLIB + AC_OUTPUT ============================================================ --- netxx/configure.ac cd0be0962f79b2628b10d9739460595c1c3dacb6 +++ netxx/configure.ac 9561c7e3046c5c51bbdf0cdf7ea0190fd9c3566f @@ -26,6 +26,7 @@ AC_PROG_CXX AC_CONFIG_FILES([Makefile]) AC_PROG_CXX +AC_PROG_INSTALL AC_PROG_RANLIB AC_LANG_PUSH([C++]) ============================================================ --- sqlite/Makefile.am ef1193d1b936b1f03cbc90f5cc32378ffd79b735 +++ sqlite/Makefile.am f5e33fc2a5bd1a67c59b2f7550d7df58d34d50b1 @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1 - lib_LIBRARIES = libsqlite.a include_HEADERS = sqlite3.h sqlite3ext.h libsqlite_a_SOURCES = \ @@ -12,8 +10,3 @@ libsqlite_a_SOURCES = \ sqliteLimit.h table.c tokenize.c trigger.c update.c utf.c \ util.c vacuum.c vdbeapi.c vdbeaux.c vdbeblob.c vdbe.c \ vdbefifo.c vdbe.h vdbeInt.h vdbemem.c vtab.c where.c - -libsqlite_a_CPPFLAGS = -libsqlite_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) -libsqlite_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS) - ============================================================ --- sqlite/configure.ac a384a290bbe736d11f60880071681770d16cd3b2 +++ sqlite/configure.ac eb7266e0fe0ddfc25fac85f9d66a21784fa9562e @@ -18,9 +18,15 @@ AC_INIT(sqlite, XX, address@hidden AC_PREREQ(2.58) AC_INIT(sqlite, XX, address@hidden) -AM_INIT_AUTOMAKE AC_CONFIG_AUX_DIR([..]) AC_CONFIG_MACRO_DIR([../m4]) + +AM_INIT_AUTOMAKE([1.7.1 foreign no-dist no-define]) AC_CONFIG_SRCDIR([sqlite3.h]) AC_CONFIG_FILES([Makefile]) + +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_RANLIB + AC_OUTPUT