Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5c076730
Commit
5c076730
authored
Oct 17, 2007
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Check for fontconfig in the X directory if not found in the standard places.
parent
c91350b1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
251 additions
and
2 deletions
+251
-2
configure
configure
+237
-1
configure.ac
configure.ac
+13
-0
Makefile.in
dlls/gdi32/Makefile.in
+1
-1
No files found.
configure
View file @
5c076730
...
...
@@ -755,6 +755,7 @@ ESDLIBS
ESDINCL
ALSALIBS
AUDIOIOLIBS
FONTCONFIGINCL
EXTRACFLAGS
BUILTINFLAG
LDPATH
...
...
@@ -14578,6 +14579,240 @@ _ACEOF
fi
elif
test
-n
"
$X_CFLAGS
"
then
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
CPPFLAGS
=
"
$CPPFLAGS
$X_CFLAGS
"
$as_unset
ac_cv_header_fontconfig_fontconfig_h
for
ac_header
in
fontconfig/fontconfig.h
do
as_ac_Header
=
`
echo
"ac_cv_header_
$ac_header
"
|
$as_tr_sh
`
if
{
as_var
=
$as_ac_Header
;
eval
"test
\"\$
{
$as_var
+set}
\"
= set"
;
}
;
then
{
echo
"
$as_me
:
$LINENO
: checking for
$ac_header
"
>
&5
echo
$ECHO_N
"checking for
$ac_header
...
$ECHO_C
"
>
&6
;
}
if
{
as_var
=
$as_ac_Header
;
eval
"test
\"\$
{
$as_var
+set}
\"
= set"
;
}
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
fi
ac_res
=
`
eval echo
'${'
$as_ac_Header
'}'
`
{
echo
"
$as_me
:
$LINENO
: result:
$ac_res
"
>
&5
echo
"
${
ECHO_T
}
$ac_res
"
>
&6
;
}
else
# Is the header compilable?
{
echo
"
$as_me
:
$LINENO
: checking
$ac_header
usability"
>
&5
echo
$ECHO_N
"checking
$ac_header
usability...
$ECHO_C
"
>
&6
;
}
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
_ACEOF
cat
confdefs.h
>>
conftest.
$ac_ext
cat
>>
conftest.
$ac_ext
<<
_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <
$ac_header
>
_ACEOF
rm
-f
conftest.
$ac_objext
if
{
(
ac_try
=
"
$ac_compile
"
case
"((
$ac_try
"
in
*
\"
*
|
*
\`
*
|
*
\\
*
)
ac_try_echo
=
\$
ac_try
;;
*
)
ac_try_echo
=
$ac_try
;;
esac
eval
"echo
\"\$
as_me:
$LINENO
:
$ac_try_echo
\"
"
)
>
&5
(
eval
"
$ac_compile
"
)
2>conftest.er1
ac_status
=
$?
grep
-v
'^ *+'
conftest.er1
>
conftest.err
rm
-f
conftest.er1
cat
conftest.err
>
&5
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
&&
{
test
-z
"
$ac_c_werror_flag
"
||
test
!
-s
conftest.err
}
&&
test
-s
conftest.
$ac_objext
;
then
ac_header_compiler
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
ac_header_compiler
=
no
fi
rm
-f
core conftest.err conftest.
$ac_objext
conftest.
$ac_ext
{
echo
"
$as_me
:
$LINENO
: result:
$ac_header_compiler
"
>
&5
echo
"
${
ECHO_T
}
$ac_header_compiler
"
>
&6
;
}
# Is the header present?
{
echo
"
$as_me
:
$LINENO
: checking
$ac_header
presence"
>
&5
echo
$ECHO_N
"checking
$ac_header
presence...
$ECHO_C
"
>
&6
;
}
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
_ACEOF
cat
confdefs.h
>>
conftest.
$ac_ext
cat
>>
conftest.
$ac_ext
<<
_ACEOF
/* end confdefs.h. */
#include <
$ac_header
>
_ACEOF
if
{
(
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
"
case
"((
$ac_try
"
in
*
\"
*
|
*
\`
*
|
*
\\
*
)
ac_try_echo
=
\$
ac_try
;;
*
)
ac_try_echo
=
$ac_try
;;
esac
eval
"echo
\"\$
as_me:
$LINENO
:
$ac_try_echo
\"
"
)
>
&5
(
eval
"
$ac_cpp
conftest.
$ac_ext
"
)
2>conftest.er1
ac_status
=
$?
grep
-v
'^ *+'
conftest.er1
>
conftest.err
rm
-f
conftest.er1
cat
conftest.err
>
&5
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
>
/dev/null
&&
{
test
-z
"
$ac_c_preproc_warn_flag$ac_c_werror_flag
"
||
test
!
-s
conftest.err
}
;
then
ac_header_preproc
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
ac_header_preproc
=
no
fi
rm
-f
conftest.err conftest.
$ac_ext
{
echo
"
$as_me
:
$LINENO
: result:
$ac_header_preproc
"
>
&5
echo
"
${
ECHO_T
}
$ac_header_preproc
"
>
&6
;
}
# So? What about this header?
case
$ac_header_compiler
:
$ac_header_preproc
:
$ac_c_preproc_warn_flag
in
yes
:no:
)
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: accepted by the compiler, rejected by the preprocessor!"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: accepted by the compiler, rejected by the preprocessor!"
>
&2
;
}
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: proceeding with the compiler's result"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: proceeding with the compiler's result"
>
&2
;
}
ac_header_preproc
=
yes
;;
no:yes:
*
)
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: present but cannot be compiled"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: present but cannot be compiled"
>
&2
;
}
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: check for missing prerequisite headers?"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: check for missing prerequisite headers?"
>
&2
;
}
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: see the Autoconf documentation"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: see the Autoconf documentation"
>
&2
;
}
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: section
\"
Present But Cannot Be Compiled
\"
"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: section
\"
Present But Cannot Be Compiled
\"
"
>
&2
;
}
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: proceeding with the preprocessor's result"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: proceeding with the preprocessor's result"
>
&2
;
}
{
echo
"
$as_me
:
$LINENO
: WARNING:
$ac_header
: in the future, the compiler will take precedence"
>
&5
echo
"
$as_me
: WARNING:
$ac_header
: in the future, the compiler will take precedence"
>
&2
;
}
(
cat
<<
\
_ASBOX
## ------------------------------------ ##
## Report this to wine-devel@winehq.org ##
## ------------------------------------ ##
_ASBOX
)
|
sed
"s/^/
$as_me
: WARNING: /"
>
&2
;;
esac
{
echo
"
$as_me
:
$LINENO
: checking for
$ac_header
"
>
&5
echo
$ECHO_N
"checking for
$ac_header
...
$ECHO_C
"
>
&6
;
}
if
{
as_var
=
$as_ac_Header
;
eval
"test
\"\$
{
$as_var
+set}
\"
= set"
;
}
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
eval
"
$as_ac_Header
=
\$
ac_header_preproc"
fi
ac_res
=
`
eval echo
'${'
$as_ac_Header
'}'
`
{
echo
"
$as_me
:
$LINENO
: result:
$ac_res
"
>
&5
echo
"
${
ECHO_T
}
$ac_res
"
>
&6
;
}
fi
if
test
`
eval echo
'${'
$as_ac_Header
'}'
`
=
yes
;
then
cat
>>
confdefs.h
<<
_ACEOF
#define `echo "HAVE_
$ac_header
" |
$as_tr_cpp
` 1
_ACEOF
fi
done
CPPFLAGS
=
"
$ac_save_CPPFLAGS
"
if
test
"
$ac_cv_header_fontconfig_fontconfig_h
"
=
"yes"
then
FONTCONFIGINCL
=
"
$X_CFLAGS
"
{
echo
"
$as_me
:
$LINENO
: checking for -lfontconfig"
>
&5
echo
$ECHO_N
"checking for -lfontconfig...
$ECHO_C
"
>
&6
;
}
if
test
"
${
ac_cv_lib_soname_fontconfig
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
ac_check_soname_save_LIBS
=
$LIBS
LIBS
=
"-lfontconfig
$X_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
_ACEOF
cat
confdefs.h
>>
conftest.
$ac_ext
cat
>>
conftest.
$ac_ext
<<
_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char FcInit ();
int
main ()
{
return FcInit ();
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
conftest
$ac_exeext
if
{
(
ac_try
=
"
$ac_link
"
case
"((
$ac_try
"
in
*
\"
*
|
*
\`
*
|
*
\\
*
)
ac_try_echo
=
\$
ac_try
;;
*
)
ac_try_echo
=
$ac_try
;;
esac
eval
"echo
\"\$
as_me:
$LINENO
:
$ac_try_echo
\"
"
)
>
&5
(
eval
"
$ac_link
"
)
2>conftest.er1
ac_status
=
$?
grep
-v
'^ *+'
conftest.er1
>
conftest.err
rm
-f
conftest.er1
cat
conftest.err
>
&5
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
&&
{
test
-z
"
$ac_c_werror_flag
"
||
test
!
-s
conftest.err
}
&&
test
-s
conftest
$ac_exeext
&&
$as_test_x
conftest
$ac_exeext
;
then
case
"
$LIBEXT
"
in
dll
)
;;
dylib
)
ac_cv_lib_soname_fontconfig
=
`
otool
-L
conftest
$ac_exeext
|
grep
"libfontconfig
\\
.[0-9A-Za-z.]*dylib"
|
sed
-e
"s/^.*
\/\(
libfontconfig
\.
[0-9A-Za-z.]*dylib
\)
.*
$/
\1
/"
';2,$d'
`
;;
*
)
ac_cv_lib_soname_fontconfig
=
`
$ac_cv_path_LDD
conftest
$ac_exeext
|
grep
"libfontconfig
\\
.
$LIBEXT
"
|
sed
-e
"s/^.*
\(
libfontconfig
\.
$LIBEXT
[^ ]*
\)
.*
$/
\1
/"
';2,$d'
`
;;
esac
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
fi
rm
-f
core conftest.err conftest.
$ac_objext
conftest_ipa8_conftest.oo
\
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
$ac_check_soname_save_LIBS
fi
if
test
"x
$ac_cv_lib_soname_fontconfig
"
=
"x"
;
then
{
echo
"
$as_me
:
$LINENO
: result: not found"
>
&5
echo
"
${
ECHO_T
}
not found"
>
&6
;
}
else
{
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_lib_soname_fontconfig
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_lib_soname_fontconfig
"
>
&6
;
}
cat
>>
confdefs.h
<<
_ACEOF
#define SONAME_LIBFONTCONFIG "
$ac_cv_lib_soname_fontconfig
"
_ACEOF
fi
fi
fi
if
test
"x
$ac_cv_lib_soname_fontconfig
"
=
"x"
;
then
wine_notices
=
"
$wine_notices
|fontconfig development files not found.
...
...
@@ -22180,6 +22415,7 @@ ESDLIBS!$ESDLIBS$ac_delim
ESDINCL!
$ESDINCL$ac_delim
ALSALIBS!
$ALSALIBS$ac_delim
AUDIOIOLIBS!
$AUDIOIOLIBS$ac_delim
FONTCONFIGINCL!
$FONTCONFIGINCL$ac_delim
EXTRACFLAGS!
$EXTRACFLAGS$ac_delim
BUILTINFLAG!
$BUILTINFLAG$ac_delim
LDPATH!
$LDPATH$ac_delim
...
...
@@ -22194,7 +22430,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!
$LTLIBOBJS$ac_delim
_ACEOF
if
test
`
sed
-n
"s/.*
$ac_delim
\$
/X/p"
conf
$$
subs.sed |
grep
-c
X
`
=
7
0
;
then
if
test
`
sed
-n
"s/.*
$ac_delim
\$
/X/p"
conf
$$
subs.sed |
grep
-c
X
`
=
7
1
;
then
break
elif
$ac_last_try
;
then
{
{
echo
"
$as_me
:
$LINENO
: error: could not make
$CONFIG_STATUS
"
>
&5
...
...
configure.ac
View file @
5c076730
...
...
@@ -1047,6 +1047,19 @@ dnl **** Check for fontconfig ****
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
then
WINE_CHECK_SONAME(fontconfig,FcInit)
elif test -n "$X_CFLAGS"
then
dnl fontconfig is in the X directory on Mac OS X
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
$as_unset ac_cv_header_fontconfig_fontconfig_h
AC_CHECK_HEADERS([fontconfig/fontconfig.h])
CPPFLAGS="$ac_save_CPPFLAGS"
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
then
AC_SUBST(FONTCONFIGINCL,"$X_CFLAGS")
WINE_CHECK_SONAME(fontconfig,FcInit,,,[$X_LIBS])
fi
fi
WINE_NOTICE_IF([test "x$ac_cv_lib_soname_fontconfig" = "x"],[fontconfig development files not found.
Wine will be built without fontconfig support.])
...
...
dlls/gdi32/Makefile.in
View file @
5c076730
...
...
@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE
=
gdi32.dll
IMPORTLIB
=
libgdi32.
$(IMPLIBEXT)
IMPORTS
=
advapi32 kernel32 ntdll
EXTRAINCL
=
@FREETYPEINCL@
EXTRAINCL
=
@FREETYPEINCL@
@FONTCONFIGINCL@
EXTRALIBS
=
@CARBONLIB@
SPEC_SRCS16
=
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment