]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 17:54:19 +0000 (13:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 17:54:19 +0000 (13:54 -0400)
Conflicts:
configure.ac

1  2 
configure.ac

diff --cc configure.ac
index dd79e4daed72805f49bcd18e6dc7f28a737a6fd6,abe5e231c1bc34235dbc0fec4475ff35c06672ba..e5a8611410c7c5d5ac3c285d4e3516f9db32a4b8
@@@ -35,16 -25,16 +35,15 @@@ AC_CANONICAL_HOS
  dnl the 'build' machine is where we run configure and compile
  dnl the 'host' machine is where the resulting stuff runs.
  
 -case "$host_os" in
 -
 - osf5*)
 -    CFLAGS="$CFLAGS -D_OSF_SOURCE"
 -    ;;
 -esac
 +#case "$host_os" in
 +#
 +# osf5*)
 +#    CFLAGS="$CFLAGS -D_OSF_SOURCE"
 +#    ;;
 +#esac
  
  dnl Checks for programs.
 -AC_PROG_CC
  AM_PROG_CC_C_O
- AC_PROG_SED
  AC_PROG_INSTALL
  AC_PROG_LN_S
  # AC_PROG_MKDIR_P - $(MKDIR_P) should be defined by AM_INIT_AUTOMAKE