hush autoconf

This commit is contained in:
Love Hörnquist Åstrand
2014-08-22 21:52:27 -07:00
parent e6ed2bc9df
commit f05236b202
2 changed files with 6 additions and 4 deletions

View File

@@ -28,7 +28,8 @@ if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
fi fi
dnl Check that the `prefix' and `index' directives were honored. dnl Check that the `prefix' and `index' directives were honored.
AC_RUN_IFELSE([ AC_LANG(C)
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <com_err.h> #include <com_err.h>
#include <string.h> #include <string.h>
#include "conftest_et.h" #include "conftest_et.h"
@@ -37,7 +38,7 @@ int main(int argc, char **argv){
#error compile_et does not handle error_table N M #error compile_et does not handle error_table N M
#endif #endif
return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;} return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"], ])], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"],
[krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes] ) [krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes] )
fi fi
AC_MSG_RESULT(${krb_cv_compile_et}) AC_MSG_RESULT(${krb_cv_compile_et})

View File

@@ -32,7 +32,8 @@ if test "$no_x" != yes; then
done done
fi fi
LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
AC_RUN_IFELSE([ AC_LANG(C)
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <X11/Xlib.h> #include <X11/Xlib.h>
foo(void) foo(void)
{ {
@@ -42,7 +43,7 @@ if test "$no_x" != yes; then
{ {
return 0; return 0;
} }
],krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:, ])],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) krb_cv_sys_x_libs_rpath="" ; krb_cv_sys_x_libs="" ; break)
done done
LIBS="$ac_save_libs" LIBS="$ac_save_libs"