Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
2d1a6274
Commit
2d1a6274
authored
19 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Added a WINE_CHECK_LIB_FUNCS macro to check for functions
when linking with specific libraries.
parent
6e27152c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aclocal.m4
+10
-0
10 additions, 0 deletions
aclocal.m4
configure
+6
-7
6 additions, 7 deletions
configure
configure.ac
+6
-11
6 additions, 11 deletions
configure.ac
with
22 additions
and
18 deletions
aclocal.m4
+
10
−
0
View file @
2d1a6274
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
configure
+
6
−
7
View file @
2d1a6274
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
6
−
11
View file @
2d1a6274
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment