Attachment #188422 for bug #260806

Lines 34-44 Link Here

(-)Makefile.in (-2 / +2 lines)
34	#	34	#
35		35
36	#XCFLAGS=-O -g -export-dynamic	36	#XCFLAGS=-O -g -export-dynamic
37	IRCDLIBS=@IRCDLIBS@ @TRELIBS@ @CARESLIBS@	37	IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARESLIBS@
38	CRYPTOLIB=@CRYPTOLIB@	38	CRYPTOLIB=@CRYPTOLIB@
39	OPENSSLINCLUDES=	39	OPENSSLINCLUDES=
40		40
41	XCFLAGS=-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@	41	XCFLAGS=@TRE_CFLAGS@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@
42	#	42	#
43	# use the following on MIPS:	43	# use the following on MIPS:
44	#CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)	44	#CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)




	AC_DEFINE(DISABLE_USERMOD))
AC_ARG_WITH(operoverride-verify, [AC_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])],
	AC_DEFINE(OPEROVERRIDE_VERIFY))
AC_ARG_WITH(system-tre, [AC_HELP_STRING([--with-system-tre], [Use the system tre package instead of bundled, discovered using pkg-config])], [], [with_system_tre=no ])
CHECK_SSL
CHECK_ZLIB
CHECK_LIBCURL

;;
esac

AS_IF([test "x$with_system_tre" = "xno"],[
dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!
tre_version="0.7.5"
AC_MSG_RESULT(extracting TRE regex library)

$ac_cv_prog_MAKER || exit 1
AC_MSG_RESULT(installing TRE regex library)
$ac_cv_prog_MAKER install || exit 1
TRE_CFLAGS="-I$cur_dir/extras/regexp/include"
AC_SUBST(TRE_CFLAGS)
if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
	TRE_LIBS="-L../extras/regexp/lib -ltre"
else
	TRE_LIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc`
fi
AC_SUBST(TRE_LIBS)
cd $cur_dir
],[
dnl use pkgconfig for tre:
PKG_PROG_PKG_CONFIG(0.17)
PKG_CHECK_MODULES([TRE], tre >= 0.7.5)
])

dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
cares_version="1.6.0"

Return to bug 260806

Lines 392-397 Link Here

(-)autoconf/configure.in (-6 / +12 lines)
392	AC_DEFINE(DISABLE_USERMOD))	392	AC_DEFINE(DISABLE_USERMOD))
393	AC_ARG_WITH(operoverride-verify, [AC_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])],	393	AC_ARG_WITH(operoverride-verify, [AC_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])],
394	AC_DEFINE(OPEROVERRIDE_VERIFY))	394	AC_DEFINE(OPEROVERRIDE_VERIFY))
		395	AC_ARG_WITH(system-tre, [AC_HELP_STRING([--with-system-tre], [Use the system tre package instead of bundled, discovered using pkg-config])], [], [with_system_tre=no ])
395	CHECK_SSL	396	CHECK_SSL
396	CHECK_ZLIB	397	CHECK_ZLIB
397	CHECK_LIBCURL	398	CHECK_LIBCURL
Lines 424-429 Link Here
424	;;	425	;;
425	esac	426	esac
426		427
		428	AS_IF([test "x$with_system_tre" = "xno"],[
427	dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!	429	dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!
428	tre_version="0.7.5"	430	tre_version="0.7.5"
429	AC_MSG_RESULT(extracting TRE regex library)	431	AC_MSG_RESULT(extracting TRE regex library)
Lines 446-461 Link Here
446	$ac_cv_prog_MAKER \|\| exit 1	448	$ac_cv_prog_MAKER \|\| exit 1
447	AC_MSG_RESULT(installing TRE regex library)	449	AC_MSG_RESULT(installing TRE regex library)
448	$ac_cv_prog_MAKER install \|\| exit 1	450	$ac_cv_prog_MAKER install \|\| exit 1
449	TREINCDIR="$cur_dir/extras/regexp/include"	451	TRE_CFLAGS="-I$cur_dir/extras/regexp/include"
450	AC_SUBST(TREINCDIR)	452	AC_SUBST(TRE_CFLAGS)
451	if test "x$ac_cv_path_PKGCONFIG" = "x" ; then	453	if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
452	TRELIBS="-L../extras/regexp/lib -ltre"	454	TRE_LIBS="-L../extras/regexp/lib -ltre"
453	else	455	else
454	TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc`	456	TRE_LIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc`
455	fi	457	fi
456	AC_SUBST(TRELIBS)	458	AC_SUBST(TRE_LIBS)
457	cd $cur_dir	459	cd $cur_dir
458		460	],[
		461	dnl use pkgconfig for tre:
		462	PKG_PROG_PKG_CONFIG(0.17)
		463	PKG_CHECK_MODULES([TRE], tre >= 0.7.5)
		464	])
459		465
460	dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!	466	dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
461	cares_version="1.6.0"	467	cares_version="1.6.0"