# # # patch "Makefile.am" # from [99f85657145e2545d84436bce52ea57c6b08b9f2] # to [a1dc52e4b2b5eff735fcd4c1f2518e9d7c2ee928] # # patch "configure.ac" # from [17f58b554d0698b85f16801bce8fe74c2746a3f8] # to [afb3d413b135e41c2c60d21ab9ba6f653dbbca59] # ============================================================ --- Makefile.am 99f85657145e2545d84436bce52ea57c6b08b9f2 +++ Makefile.am a1dc52e4b2b5eff735fcd4c1f2518e9d7c2ee928 @@ -405,7 +405,7 @@ AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE= AM_CPPFLAGS = -I$(top_srcdir)/lua AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DSQLITE_OMIT_CURSOR -DSQLITE_OMIT_LOAD_EXTENSION -DTHREADSAFE=0 -DSQLITE_THREAD_OVERRIDE_LOCK=-1 $(SQLITE_CPPFLAGS) -AM_CXXFLAGS = $(AM_CPPFLAGS) $(PCH_FLAGS) +AM_CXXFLAGS = $(AM_CPPFLAGS) $(PCH_FLAGS) -fpermissive mtn_LDADD = libplatform.a lib3rdparty.a $(BOOSTLIBS) $(LIBICONV) $(LIBINTL) unit_tester_LDADD = libplatform.a lib3rdparty.a \ ============================================================ --- configure.ac 17f58b554d0698b85f16801bce8fe74c2746a3f8 +++ configure.ac afb3d413b135e41c2c60d21ab9ba6f653dbbca59 @@ -30,15 +30,15 @@ AC_CACHE_CHECK([whether this is Windows] AC_CC_FEXCEPTIONS AC_CACHE_CHECK([whether this is Windows], - ac_win32, [ + ac_cv_win32, [ AC_TRY_COMPILE([#ifdef WIN32 #include #endif], [HANDLE h; DWORD d;], - ac_win32=yes, - ac_win32=no) + ac_cv_win32=yes, + ac_cv_win32=no) ]) -if test "$ac_win32" = "yes"; then +if test "$ac_cv_win32" = "yes"; then AM_CONDITIONAL(WIN32_PLATFORM, true) AC_DEFINE(os_err_t, unsigned int, [OS-specific error type]) else @@ -47,15 +47,15 @@ AC_CACHE_CHECK([whether this is AIX], fi AC_CACHE_CHECK([whether this is AIX], - ac_aix, [ + ac_cv_aix, [ AC_TRY_COMPILE([#ifndef _AIX #error "This is not AIX" #endif], [int i;], - ac_aix=yes, - ac_aix=no) + ac_cv_aix=yes, + ac_cv_aix=no) ]) -if test "$ac_aix" = "yes"; then +if test "$ac_cv_aix" = "yes"; then AM_CONDITIONAL(AIX_PLATFORM, true) LDFLAGS="$LDFLAGS -Wl,-bexpfull" else