# # add_file "m4/fexception.m4" # # patch "ChangeLog" # from [4618e22780f227ba8b634d33433ce38bf1d50e0d] # to [01a9ca30b3c3f9f216d422d8e20e4bdf38d7339c] # # patch "Makefile.am" # from [8963b7c36de49d887c7f8c115ab516249ac678cf] # to [c8f56d086950c437c10c455b623b7fb4766a8bdf] # # patch "configure.ac" # from [25dbc7b10cf740f084a4c1e5b29b4cf3ae11e3e6] # to [924910be6bf927d013f26039bd45f1662e1627cc] # # patch "m4/fexception.m4" # from [] # to [542772ba94311933bcfb566263af93b423355735] # # patch "unix/process.cc" # from [19a85f2a6d49d71960b847302b34bd8e99bd56d8] # to [2d952838b067e002206f6a67999534a3e1143218] # ======================================================================== --- ChangeLog 4618e22780f227ba8b634d33433ce38bf1d50e0d +++ ChangeLog 01a9ca30b3c3f9f216d422d8e20e4bdf38d7339c @@ -1,3 +1,10 @@ +2005-08-17 Patrick Mauritz + + * unix/process.cc: missing include + * m4/fexceptions.m4, configure.ac, Makefile.am: remove hardcoded + -fexceptions in CFLAGS and add it only if compiler doesn't freak + out. + 2005-08-17 Nathaniel Smith * netsync.cc: Add IANA port assignment to the todo list. ======================================================================== --- Makefile.am 8963b7c36de49d887c7f8c115ab516249ac678cf +++ Makefile.am c8f56d086950c437c10c455b623b7fb4766a8bdf @@ -221,7 +221,7 @@ $(LUA_SOURCES) \ $(SQLITE_SOURCES) # We want to be able to throw exceptions through the Lua interpreter -lib3rdparty_a_CFLAGS = $(AM_CFLAGS) -fexceptions +lib3rdparty_a_CFLAGS = $(AM_CFLAGS) # flags ======================================================================== --- configure.ac 25dbc7b10cf740f084a4c1e5b29b4cf3ae11e3e6 +++ configure.ac 924910be6bf927d013f26039bd45f1662e1627cc @@ -25,6 +25,7 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_RANLIB +AC_CC_FEXCEPTIONS AC_LANG(C++) AC_PROG_CXX_WARNINGS ======================================================================== --- m4/fexception.m4 +++ m4/fexception.m4 542772ba94311933bcfb566263af93b423355735 @@ -0,0 +1,30 @@ +dnl @synopsis AC_CC_FEXCEPTIONS +dnl +dnl tests if compiler bails out on -fexception. doesn't catch situation +dnl where it just emits a warning. +dnl +dnl taken from expat's configure.in +dnl +dnl @author Patrick Mauritz +dnl @version 2005-08-17 +dnl @license MIT/X + +AC_DEFUN([AC_CC_FEXCEPTIONS],[ +AC_CACHE_CHECK(whether the compiler knows -fexception, +ac_cv_cc_fexceptions, +[ + AC_LANG_SAVE + AC_LANG_C + + OLDCFLAGS="$CFLAGS" + CFLAGS="$OLDCFLAGS -fexceptions" + AC_TRY_COMPILE(,(void)1, + ac_cv_cc_fexceptions=yes, + ac_cv_cc_fexceptions=no) + CFLAGS="$OLDCFLAGS" + AC_LANG_RESTORE +]) +if test "$ac_cv_cc_fexceptions" = yes; then + CFLAGS="$CFLAGS -fexceptions" +fi +]) ======================================================================== --- unix/process.cc 19a85f2a6d49d71960b847302b34bd8e99bd56d8 +++ unix/process.cc 2d952838b067e002206f6a67999534a3e1143218 @@ -10,6 +10,7 @@ #include #include #include +#include #include