Drop X11 autoconf and travis deps

This commit is contained in:
Viktor Dukhovni
2016-11-14 14:34:43 -05:00
parent bb507cd4d4
commit d454492d01
4 changed files with 1 additions and 123 deletions

View File

@@ -6,7 +6,7 @@ env:
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq bison comerr-dev flex libcap-ng-dev libdb-dev libedit-dev libjson-perl libldap2-dev libncurses5-dev libperl4-corelibs-perl libsqlite3-dev libx11-dev libxau-dev libxt-dev pkg-config python ss-dev texinfo x11proto-core-dev unzip netbase - sudo apt-get install -qq bison comerr-dev flex libcap-ng-dev libdb-dev libedit-dev libjson-perl libldap2-dev libncurses5-dev libperl4-corelibs-perl libsqlite3-dev pkg-config python ss-dev texinfo unzip netbase
- mkdir ci-build - mkdir ci-build
- mkdir coverity-build - mkdir coverity-build
- ./autogen.sh - ./autogen.sh

View File

@@ -1,54 +0,0 @@
dnl
dnl See if there is any X11 present
dnl
dnl $Id$
AC_DEFUN([KRB_CHECK_X],[
AC_PATH_XTRA
# try to figure out if we need any additional ld flags, like -R
# and yes, the autoconf X test is utterly broken
if test "$no_x" != yes; then
AC_CACHE_CHECK(for special X linker flags,krb_cv_sys_x_libs_rpath,[
ac_save_libs="$LIBS"
ac_save_cflags="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
krb_cv_sys_x_libs_rpath=""
krb_cv_sys_x_libs=""
for rflag in "" "-R" "-R " "-rpath "; do
if test "$rflag" = ""; then
foo="$X_LIBS"
else
foo=""
for flag in $X_LIBS; do
case $flag in
-L*)
foo="$foo $flag `echo $flag | sed \"s/-L/$rflag/\"`"
;;
*)
foo="$foo $flag"
;;
esac
done
fi
LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
AC_LANG(C)
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <X11/Xlib.h>
foo(void)
{
XOpenDisplay(NULL);
}
main(int argc, char **argv)
{
return 0;
}
])],krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:,
krb_cv_sys_x_libs_rpath="" ; krb_cv_sys_x_libs="" ; break)
done
LIBS="$ac_save_libs"
CFLAGS="$ac_save_cflags"
])
X_LIBS="$krb_cv_sys_x_libs"
fi
])

View File

@@ -1,64 +0,0 @@
dnl $Id$
dnl
dnl check for Xau{Read,Write}Auth and XauFileName
dnl
AC_DEFUN([AC_CHECK_XAU],[
save_CFLAGS="$CFLAGS"
CFLAGS="$X_CFLAGS $CFLAGS"
save_LIBS="$LIBS"
dnl LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
## check for XauWriteAuth first, so we detect the case where
## XauReadAuth is in -lX11, but XauWriteAuth is only in -lXau this
## could be done by checking for XauReadAuth in -lXau first, but this
## breaks in IRIX 6.5
AC_FIND_FUNC_NO_LIBS(XauWriteAuth, X11 Xau,[#include <X11/Xauth.h>],[0,0])
ac_xxx="$LIBS"
LIBS="$LIB_XauWriteAuth $LIBS"
AC_FIND_FUNC_NO_LIBS(XauReadAuth, X11 Xau,[#include <X11/Xauth.h>],[0])
LIBS="$LIB_XauReadAauth $LIBS"
AC_FIND_FUNC_NO_LIBS(XauFileName, X11 Xau,[#include <X11/Xauth.h>])
LIBS="$ac_xxx"
## set LIB_XauReadAuth to union of these tests, since this is what the
## Makefiles are using
case "$ac_cv_funclib_XauWriteAuth" in
yes) ;;
no) ;;
*) if test "$ac_cv_funclib_XauReadAuth" = yes; then
if test "$ac_cv_funclib_XauFileName" = yes; then
LIB_XauReadAuth="$LIB_XauWriteAuth"
else
LIB_XauReadAuth="$LIB_XauWriteAuth $LIB_XauFileName"
fi
else
if test "$ac_cv_funclib_XauFileName" = yes; then
LIB_XauReadAuth="$LIB_XauReadAuth $LIB_XauWriteAuth"
else
LIB_XauReadAuth="$LIB_XauReadAuth $LIB_XauWriteAuth $LIB_XauFileName"
fi
fi
;;
esac
if test "$AUTOMAKE" != ""; then
AM_CONDITIONAL(NEED_WRITEAUTH, test "$ac_cv_func_XauWriteAuth" != "yes")
else
AC_SUBST(NEED_WRITEAUTH_TRUE)
AC_SUBST(NEED_WRITEAUTH_FALSE)
if test "$ac_cv_func_XauWriteAuth" != "yes"; then
NEED_WRITEAUTH_TRUE=
NEED_WRITEAUTH_FALSE='#'
else
NEED_WRITEAUTH_TRUE='#'
NEED_WRITEAUTH_FALSE=
fi
fi
CFLAGS=$save_CFLAGS
LIBS=$save_LIBS
LDFLAGS=$save_LDFLAGS
])

View File

@@ -12,16 +12,13 @@ fi
AM_CONDITIONAL(DEVELOPER_MODE, test "X$enable_developer" = Xyes) AM_CONDITIONAL(DEVELOPER_MODE, test "X$enable_developer" = Xyes)
WFLAGS_NOUNUSED="" WFLAGS_NOUNUSED=""
WFLAGS_NOIMPLICITINT=""
if test -z "$WFLAGS" -a "$GCC" = "yes"; then if test -z "$WFLAGS" -a "$GCC" = "yes"; then
# -Wno-implicit-int for broken X11 headers
# leave these out for now: # leave these out for now:
# -Wcast-align doesn't work well on alpha osf/1 # -Wcast-align doesn't work well on alpha osf/1
# -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast # -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast
# -Wmissing-declarations -Wnested-externs # -Wmissing-declarations -Wnested-externs
# -Wstrict-overflow=5 # -Wstrict-overflow=5
WFLAGS="ifelse($#, 0,-Wall, $1) $dwflags" WFLAGS="ifelse($#, 0,-Wall, $1) $dwflags"
WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
# #
# WFLAGS_LITE can be appended to WFLAGS to turn off a host of warnings # WFLAGS_LITE can be appended to WFLAGS to turn off a host of warnings
@@ -33,5 +30,4 @@ if test -z "$WFLAGS" -a "$GCC" = "yes"; then
fi fi
AC_SUBST(WFLAGS)dnl AC_SUBST(WFLAGS)dnl
AC_SUBST(WFLAGS_LITE)dnl AC_SUBST(WFLAGS_LITE)dnl
AC_SUBST(WFLAGS_NOIMPLICITINT)dnl
]) ])