zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Added a WINE_CHECK_LIB_FUNCS macro to check for functions

Browse source 
when linking with specific libraries.
This commit is contained in:
Alexandre Julliard 2006-02-11 20:54:06 +01:00
parent 6e27152c96
commit 2d1a6274ee
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aclocal.m4 vendored
View file

@ -94,6 +94,16 @@ AS_IF([test AS_VAR_GET(ac_var) = yes],
LINTFLAGS="$LINTFLAGS -D$1"])dnl
AS_VAR_POPDEF([ac_var])])
dnl **** Check for functions with some extra libraries ****
dnl
dnl Usage: WINE_CHECK_LIB_FUNCS(funcs,libs,[action-if-found,[action-if-not-found]])
dnl
AC_DEFUN([WINE_CHECK_LIB_FUNCS],
[ac_wine_check_funcs_save_LIBS="$LIBS"
LIBS="$LIBS $2"
AC_CHECK_FUNCS([$1],[$3],[$4])
LIBS="$ac_wine_check_funcs_save_LIBS"])
dnl **** Check for ln ****
dnl
dnl Usage: WINE_PROG_LN

13
configure vendored
View file

@ -9757,8 +9757,8 @@ fi
fi
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
ac_wine_check_funcs_save_LIBS="$LIBS"
LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
@ -9867,7 +9867,7 @@ _ACEOF
fi
done
LIBS="$ac_save_LIBS"
LIBS="$ac_wine_check_funcs_save_LIBS"
fi
FREETYPELIBS=""
@ -10567,7 +10567,7 @@ _ACEOF
fi
ac_save_LIBS="$LIBS"
ac_wine_check_funcs_save_LIBS="$LIBS"
LIBS="$LIBS $LIBPTHREAD"
@ -10575,8 +10575,7 @@ LIBS="$LIBS $LIBPTHREAD"
for ac_func in \
pthread_getattr_np \
pthread_get_stackaddr_np \
pthread_get_stacksize_np \
pthread_get_stacksize_np
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@ -10676,7 +10675,7 @@ _ACEOF
fi
done
LIBS="$ac_save_LIBS"
LIBS="$ac_wine_check_funcs_save_LIBS"
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2

17
configure.ac
View file

@ -553,14 +553,12 @@ then
LDAPLIBS="-lldap_r -llber"],,
[$LIBPTHREAD])],,
[$LIBPTHREAD])
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
AC_CHECK_FUNCS(\
WINE_CHECK_LIB_FUNCS(\
ldap_count_references \
ldap_first_reference \
ldap_next_reference \
ldap_parse_reference)
LIBS="$ac_save_LIBS"
ldap_parse_reference,
[$LDAPLIBS $LIBPTHREAD])
fi
dnl **** Check for FreeType 2 ****
@ -689,14 +687,11 @@ AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE
#include <pthread.h>])
dnl **** Check for pthread functions ****
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LIBPTHREAD"
AC_CHECK_FUNCS(\
WINE_CHECK_LIB_FUNCS(\
pthread_getattr_np \
pthread_get_stackaddr_np \
pthread_get_stacksize_np \
)
LIBS="$ac_save_LIBS"
pthread_get_stacksize_np,
[$LIBPTHREAD])
dnl **** Check for aRts Sound Server ****
AC_PATH_PROG(ARTSCCONFIG, artsc-config)