oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

only add /usr/include/et to CPPFLAGS if it's actually used

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10625 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-09-02 17:08:48 +00:00
parent f8a8bcf466
commit 945bb84472
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cf/check-compile-et.m4
View File

@@ -20,13 +20,18 @@ error_code CODE2, "CODE2"
end end
EOF EOF
if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
dnl XXX Some systems have <et/com_err.h>.
save_CPPFLAGS="${save_CPPFLAGS}"
if test -d "/usr/include/et"; then
CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
fi
dnl Check that the `prefix' and `index' directives were honored. dnl Check that the `prefix' and `index' directives were honored.
AC_TRY_RUN([ AC_TRY_RUN([
#include <com_err.h> #include <com_err.h>
#include <string.h> #include <string.h>
#include "conftest_et.h" #include "conftest_et.h"
int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;} int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
], [krb_cv_compile_et="yes"],[]) ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
fi fi
AC_MSG_RESULT(${krb_cv_compile_et}) AC_MSG_RESULT(${krb_cv_compile_et})
rm -fr conftest* rm -fr conftest*
@@ -36,15 +41,11 @@ if test "${krb_cv_compile_et}" = "yes"; then
dnl Since compile_et seems to work, let's check libcom_err dnl Since compile_et seems to work, let's check libcom_err
krb_cv_save_LIBS="${LIBS}" krb_cv_save_LIBS="${LIBS}"
LIBS="${LIBS} -lcom_err" LIBS="${LIBS} -lcom_err"
dnl XXX Some systems have <et/com_err.h>.
if test -d "/usr/include/et"; then
CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
fi
AC_MSG_CHECKING(for com_err) AC_MSG_CHECKING(for com_err)
AC_TRY_LINK([#include <com_err.h>],[ AC_TRY_LINK([#include <com_err.h>],[
const char *p; const char *p;
p = error_message(0); p = error_message(0);
],[krb_cv_com_err="yes"],[krb_cv_com_err="no"]) ],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
AC_MSG_RESULT(${krb_cv_com_err}) AC_MSG_RESULT(${krb_cv_com_err})
LIBS="${krb_cv_save_LIBS}" LIBS="${krb_cv_save_LIBS}"
else else