Commit 562f299a authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix sequence in which include directories are tried.

* Also enable another library name for OSSP UUID library, it is
  installed as libuuid sometimes.
parent dddeec60
......@@ -26504,13 +26504,13 @@ $as_echo_n "checking for uuid.h extra include path... " >&6; }
else
ac_include_search_uuid_h_SAVE="$CPPFLAGS"
while :; do
for ac_incdir in ''; do
for ac_incdir in '' /usr/include/ossp; do
if test -z "$ac_incdir"; then :
ac_res="none required"
CPPFLAGS="-I/usr/include/ossp $OSSP_UUID_C_INCLUDE $ac_include_search_uuid_h_SAVE"
CPPFLAGS="$OSSP_UUID_C_INCLUDE $ac_include_search_uuid_h_SAVE"
else
ac_res="-I$ac_incdir"
CPPFLAGS="-I/usr/include/ossp $OSSP_UUID_C_INCLUDE $ac_res $ac_include_search_uuid_h_SAVE"
CPPFLAGS="$OSSP_UUID_C_INCLUDE $ac_res $ac_include_search_uuid_h_SAVE"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
......@@ -26523,9 +26523,9 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if ${acx_cv_c_include_uuid_h+:} false; then :
if test -z "$ac_incdir"; then :
acx_cv_c_include_uuid_h="-I/usr/include/ossp $OSSP_UUID_C_INCLUDE"
acx_cv_c_include_uuid_h="$OSSP_UUID_C_INCLUDE"
else
acx_cv_c_include_uuid_h="-I/usr/include/ossp $OSSP_UUID_C_INCLUDE -I$ac_incdir"
acx_cv_c_include_uuid_h="$OSSP_UUID_C_INCLUDE -I$ac_incdir"
fi
fi
if ${acx_cv_c_include_uuid_h+:} false; then :
......@@ -26597,7 +26597,7 @@ return uuid_create ();
return 0;
}
_ACEOF
for ac_lib in '' ossp-uuid; do
for ac_lib in '' ossp-uuid uuid; do
if test -z "$ac_lib"; then :
ac_res="none required"
LIBS="$OSSP_UUID_C_LIB $acx_option_func_search_save_LIBS"
......@@ -46,7 +46,7 @@ dnl [INCLUDE], [EXTRA-INCLUDES], [EXTRA-INCLUDEFLAGS],
dnl [ACTION-IF_HEADER-NOT-FOUND],
dnl [FUNCTION], [LIB-CANDIDATES], [EXTRA-LIBS], [EXTRA-LIBFLAGS],
dnl [ACTION-IF-LIB-NOT-FOUND],
dnl [DEFAULT-ROOT])
dnl [DEFAULT-ROOT], [EXTRA-INCLUDE-PATHS-TO-TRY])
dnl -------------------------------------------------------------------
dnl Check wether INCLUDE can be compiled and FUNCTION is found in
dnl LIB-CANDIDATES. Sets PACKAGE_C_LIB and PACKAGE_C_INCLUDE variables to
......@@ -57,7 +57,7 @@ dnl Also defines configure --with arguments for PACKAGEROOT,
dnl PACKAGE-LIB and PACKAGE-INCLUDE.
AC_DEFUN([ACX_C_PACKAGE],
[AC_LANG_PUSH([C])
ACX_GENERIC_PACKAGE([$1],[$2],[-I],[$3],[$4],[$5],[$6],[-L],[$7],[$8],[$9],[$10],[$11],[$12])
ACX_GENERIC_PACKAGE([$1],[$2],[-I],[$3],[$4],[$5],[$6],[-L],[$7],[$8],[$9],[$10],[$11],[$12],[$13])
AC_LANG_POP([C])dnl
])
dnl
......
......@@ -49,7 +49,7 @@ dnl
dnl ACX_GENERIC_PACKAGE(PACKAGE, [INCLUDE], INC_FLAG, [EXTRA-INCLUDES],
dnl [EXTRA-INCLUDEFLAGS], [ACTION-IF_HEADER-NOT-FOUND], [FUNCTION],
dnl LIBFLAG, [LIB-CANDIDATES], [EXTRA-LIBS], [EXTRA-LIBFLAGS],
dnl [ACTION-IF-LIB-NOT-FOUND], [DEFAULT-ROOT])
dnl [ACTION-IF-LIB-NOT-FOUND], [DEFAULT-ROOT], [EXTRA-INCLUDE-DIRS-TO-TRY])
dnl -------------------------------------------------------------------
dnl Check wether INCLUDE can be compiled and FUNCTION is found in
dnl LIB-CANDIDATES with current language compiler. Sets PACKAGE_LANG_LIB
......@@ -93,7 +93,7 @@ AC_DEFUN([ACX_GENERIC_PACKAGE],
AC_ARG_VAR(acx_pkg_inc,dnl
[specifically set flags to use when compiling sources
using $1 includes.])
ACX_LANG_CHECK_INCLUDE_PATHS_IFELSE([$2],[],
ACX_LANG_CHECK_INCLUDE_PATHS_IFELSE([$2],[$14],
[AS_VAR_COPY([acx_temp],[acx_cv_pkg_inc])
acx_temp=`echo "$acx_temp" | sed -e 's/^ *//;s/ *$//'`
AS_VAR_COPY([acx_pkg_inc],[acx_temp])],
......
......@@ -118,8 +118,8 @@ AC_DEFUN([ACX_UUID],
CPPFLAGS=$acx_save_CPPFLAGS])],
[have_util_linux_uuid_c_bindings=no])
AS_IF([test x"$enable_ossp_uuid" != xno -a x"$have_util_linux_uuid_c_bindings" = xno],
[ACX_C_PACKAGE([ossp-uuid],[uuid.h],,[-I/usr/include/ossp],[],
[uuid_create],[[ossp-uuid]],,,[])
[ACX_C_PACKAGE([ossp-uuid],[uuid.h],,,[],
[uuid_create],[[ossp-uuid] [uuid]],,,[],,[[/usr/include/ossp]])
AS_IF([test x"$have_ossp_uuid_c_bindings" = xyes],
[acx_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="${CPPFLAGS+$CPPFLAGS }$OSSP_UUID_C_INCLUDE"
......
! This file was automatically generated, don't edit!
!
! Fortran interface for CDI library version 1.9.3
! Fortran interface for CDI library version 1.9.4rc1
!
! Author:
! -------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment