Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 254966 | Differences between
and this patch

Collapse All | Expand All

(-)/autoconf/configure.in (-32 / +35 lines)
Lines 53-58 Link Here
53
AC_SUBST(IRCDLIBS)
53
AC_SUBST(IRCDLIBS)
54
AC_SUBST(MKPASSWDLIBS)
54
AC_SUBST(MKPASSWDLIBS)
55
55
56
dnl for getting info about TRE
57
PKG_PROG_PKG_CONFIG(0.17)
58
56
dnl module checking based on Hyb7's module checking code
59
dnl module checking based on Hyb7's module checking code
57
AC_DEFUN([AC_ENABLE_DYN],
60
AC_DEFUN([AC_ENABLE_DYN],
58
[
61
[
Lines 425-462 Link Here
425
;;
428
;;
426
esac
429
esac
427
430
428
dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!
431
dnl dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE!
429
tre_version="0.7.5"
432
dnl tre_version="0.7.5"
430
AC_MSG_RESULT(extracting TRE regex library)
433
dnl AC_MSG_RESULT(extracting TRE regex library)
431
cur_dir=`pwd`
434
dnl cur_dir=`pwd`
432
cd extras
435
dnl cd extras
433
dnl remove old tre directory to force a recompile...
436
dnl dnl remove old tre directory to force a recompile...
434
rm -rf tre-$tre_version
437
dnl rm -rf tre-$tre_version
435
if test "x$ac_cv_path_GUNZIP" = "x" ; then
438
dnl if test "x$ac_cv_path_GUNZIP" = "x" ; then
436
	tar xfz tre.tar.gz
439
dnl	tar xfz tre.tar.gz
437
else
440
dnl else
438
	cp tre.tar.gz tre.tar.gz.bak
441
dnl 	cp tre.tar.gz tre.tar.gz.bak
439
	gunzip -f tre.tar.gz
442
dnl 	gunzip -f tre.tar.gz
440
	cp tre.tar.gz.bak tre.tar.gz
443
dnl 	cp tre.tar.gz.bak tre.tar.gz
441
	tar xf tre.tar
444
dnl 	tar xf tre.tar
442
fi
445
dnl fi
443
AC_MSG_RESULT(configuring TRE regex library)
446
dnl AC_MSG_RESULT(configuring TRE regex library)
444
cd tre-$tre_version
447
dnl cd tre-$tre_version
445
./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp || exit 1
448
dnl ./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp || exit 1
446
AC_MSG_RESULT(compiling TRE regex library)
449
dnl AC_MSG_RESULT(compiling TRE regex library)
447
$ac_cv_prog_MAKER || exit 1
450
dnl $ac_cv_prog_MAKER || exit 1
448
AC_MSG_RESULT(installing TRE regex library)
451
dnl AC_MSG_RESULT(installing TRE regex library)
449
$ac_cv_prog_MAKER install || exit 1
452
dnl $ac_cv_prog_MAKER install || exit 1
450
TREINCDIR="$cur_dir/extras/regexp/include"
453
dnl TREINCDIR="$cur_dir/extras/regexp/include"
451
AC_SUBST(TREINCDIR)
454
dnl AC_SUBST(TREINCDIR)
452
if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
455
dnl if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
453
	TRELIBS="-L../extras/regexp/lib -ltre"
456
dnl	TRELIBS="-L../extras/regexp/lib -ltre"
454
else
457
dnl  else
455
	TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc`
458
dnl	TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc`
456
fi
459
dnl fi
457
AC_SUBST(TRELIBS)
460
dnl AC_SUBST(TRE_LIBS) AC_SUBST(TRE_CFLAGS)
458
cd $cur_dir
461
dnl cd $cur_dir
459
462
PKG_CHECK_MODULES([TRE], tre)
460
463
461
dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
464
dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
462
cares_version="1.4.0"
465
cares_version="1.4.0"
(-)/Makefile.in (-2 / +2 lines)
Lines 34-44 Link Here
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)

Return to bug 254966