interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Put -g-O2 back by reorder tests, fixup lib search

This commit is contained in:
W.C.A. Wijngaards 2013-11-29 17:10:09 +01:00
parent be9e180b28
commit 552cb4bfca
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure.ac
View File

@ -12,6 +12,9 @@ AC_CONFIG_SRCDIR([src/getdns/getdns.h])
# LT_INIT # LT_INIT
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
AC_PROG_CPP
# Checks for programs. # Checks for programs.
AC_CANONICAL_HOST AC_CANONICAL_HOST
case "$host_os" in case "$host_os" in
@ -21,9 +24,6 @@ case "$host_os" in
;; ;;
esac esac
AC_PROG_CC
AC_PROG_CPP
# always use ./libtool unless override from commandline (libtool=mylibtool) # always use ./libtool unless override from commandline (libtool=mylibtool)
if test -z "$libtool"; then if test -z "$libtool"; then
libtool="`pwd`/libtool" libtool="`pwd`/libtool"
@ -60,16 +60,17 @@ AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=pathname],
if test x_$withval = x_yes; then if test x_$withval = x_yes; then
for dir in /usr/local /opt/local /usr/pkg /usr/sfw; do for dir in /usr/local /opt/local /usr/pkg /usr/sfw; do
if test -f "$dir/include/idna.h"; then if test -f "$dir/include/idna.h"; then
CPPFLAGS="$CPPFLAGS -I$dir/include" CFLAGS="$CFLAGS -I$dir/include"
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
AC_MSG_NOTICE([Found libidn in $dir]) AC_MSG_NOTICE([Found libidn in $dir])
break break
fi fi
done done
fi else
if test x_$withval != x_no; then if test x_$withval != x_no; then
CPPFLAGS="$CPPFLAGS -I$withval/include" CFLAGS="$CFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib" LDFLAGS="$LDFLAGS -L$withval/lib"
fi
fi fi
# find libldns # find libldns
@ -79,16 +80,17 @@ AC_ARG_WITH(libldns, AC_HELP_STRING([--with-libldns=pathname],
if test x_$withval = x_yes; then if test x_$withval = x_yes; then
for dir in /usr/local /opt/local /usr/pkg /usr/sfw; do for dir in /usr/local /opt/local /usr/pkg /usr/sfw; do
if test -f "$dir/include/ldns/ldns.h"; then if test -f "$dir/include/ldns/ldns.h"; then
CPPFLAGS="$CPPFLAGS -I$dir/include" CFLAGS="$CFLAGS -I$dir/include"
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
AC_MSG_NOTICE([Found libldns in $dir]) AC_MSG_NOTICE([Found libldns in $dir])
break break
fi fi
done done
fi else
if test x_$withval != x_no; then if test x_$withval != x_no; then
CPPFLAGS="$CPPFLAGS -I$withval/include" CFLAGS="$CFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib" LDFLAGS="$LDFLAGS -L$withval/lib"
fi
fi fi
# find libunbound # find libunbound
@ -98,16 +100,17 @@ AC_ARG_WITH(libunbound, AC_HELP_STRING([--with-libunbound=pathname],
if test x_$withval = x_yes; then if test x_$withval = x_yes; then
for dir in /usr/local /opt/local /usr/pkg /usr/sfw; do for dir in /usr/local /opt/local /usr/pkg /usr/sfw; do
if test -f "$dir/include/unbound.h"; then if test -f "$dir/include/unbound.h"; then
CPPFLAGS="$CPPFLAGS -I$dir/include" CFLAGS="$CFLAGS -I$dir/include"
LDFLAGS="$LDFLAGS -L$dir/lib" LDFLAGS="$LDFLAGS -L$dir/lib"
AC_MSG_NOTICE([Found libunbound in $dir]) AC_MSG_NOTICE([Found libunbound in $dir])
break break
fi fi
done done
fi else
if test x_$withval != x_no; then if test x_$withval != x_no; then
CPPFLAGS="$CPPFLAGS -I$withval/include" CFLAGS="$CFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib" LDFLAGS="$LDFLAGS -L$withval/lib"
fi
fi fi
# Checks for libraries. # Checks for libraries.