Skip to content

Commit 9516730

Browse files
Sietsesimo5
authored andcommitted
Fix cross compilation
Fixes Issue 106 (#106) modified: external/dinglibs.m4 A warning message is displayed to the user to make sure lib_ini_config supprts extenden INI_MS_DETECT, since the test cannot be run in a cross compilation scenario. modified: external/docbook.m4 Autoconf Macro AC_CHECK_FILE has been replaced by an explicit if ! test -e ..., as AC_CHECK_FILE is not available in cross compilation scenario. Signed-off-by: Sietse <sietse@wizdom.nu>
1 parent add65e8 commit 9516730

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

external/dinglibs.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ AC_DEFUN([WITH_LIBINI_CONFIG],
129129
return ret;
130130
}
131131
]])]
132-
,, [AC_MSG_ERROR(["ini_config library must support extended INI_MS_DETECT. See: https://pagure.io/SSSD/ding-libs/pull-request/3172"])])
132+
,, [AC_MSG_ERROR(["ini_config library must support extended INI_MS_DETECT."])], AC_MSG_WARN(["Cross Compiling. Make sure your ini_config library supports extended INI_MS_DETECT"]))
133133
134134
have_libini_config=yes
135135
], [

external/docbook.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dnl Checks if the XML catalog given by FILE exists and
2323
dnl if a particular URI appears in the XML catalog
2424
AC_DEFUN([CHECK_STYLESHEET],
2525
[
26-
AC_CHECK_FILE($1, [], [AC_MSG_ERROR([could not find XML catalog])])
26+
if ! test -e $1; then AC_MSG_ERROR([could not find XML catalog]); fi
2727
2828
AC_MSG_CHECKING([for ifelse([$3],,[$2],[$3]) in XML catalog])
2929
if AC_RUN_LOG([$XMLCATALOG --noout "$1" "$2" >&2]); then

0 commit comments

Comments
 (0)