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
a631ef63
Commit
a631ef63
authored
21 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Renamed the symbol for the cpp binary to avoid conflicts with
configure internals.
parent
8ac9773e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Make.rules.in
+0
-1
0 additions, 1 deletion
Make.rules.in
configure
+25
-24
25 additions, 24 deletions
configure
configure.ac
+2
-2
2 additions, 2 deletions
configure.ac
tools/winegcc/Makefile.in
+1
-1
1 addition, 1 deletion
tools/winegcc/Makefile.in
with
28 additions
and
28 deletions
Make.rules.in
+
0
−
1
View file @
a631ef63
...
...
@@ -22,7 +22,6 @@
SHELL = /bin/sh
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LIBS = @LIBS@
...
...
This diff is collapsed.
Click to expand it.
configure
+
25
−
24
View file @
a631ef63
...
...
@@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP ac_ct_CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP
BIN
ac_ct_CPP
BIN
TOOLSDIR
CPP
X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
# Initialize some variables set by options.
...
...
@@ -2787,11 +2787,11 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}cpp; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CPP+set}" = set; then
if test "${ac_cv_prog_CPP
BIN
+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CPP"; then
ac_cv_prog_CPP="$CPP" # Let the user override the test.
if test -n "$CPP
BIN
"; then
ac_cv_prog_CPP
BIN
="$CPP
BIN
" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
...
...
@@ -2800,7 +2800,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CPP="${ac_tool_prefix}cpp"
ac_cv_prog_CPP
BIN
="${ac_tool_prefix}cpp"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
...
...
@@ -2809,27 +2809,27 @@ done
fi
fi
CPP=$ac_cv_prog_CPP
if test -n "$CPP"; then
echo "$as_me:$LINENO: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
CPP
BIN
=$ac_cv_prog_CPP
BIN
if test -n "$CPP
BIN
"; then
echo "$as_me:$LINENO: result: $CPP
BIN
" >&5
echo "${ECHO_T}$CPP
BIN
" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test -z "$ac_cv_prog_CPP"; then
ac_ct_CPP=$CPP
if test -z "$ac_cv_prog_CPP
BIN
"; then
ac_ct_CPP
BIN
=$CPP
BIN
# Extract the first word of "cpp", so it can be a program name with args.
set dummy cpp; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CPP+set}" = set; then
if test "${ac_cv_prog_ac_ct_CPP
BIN
+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_CPP"; then
ac_cv_prog_ac_ct_CPP="$ac_ct_CPP" # Let the user override the test.
if test -n "$ac_ct_CPP
BIN
"; then
ac_cv_prog_ac_ct_CPP
BIN
="$ac_ct_CPP
BIN
" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
...
...
@@ -2838,28 +2838,28 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CPP="cpp"
ac_cv_prog_ac_ct_CPP
BIN
="cpp"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_prog_ac_ct_CPP" && ac_cv_prog_ac_ct_CPP="cpp"
test -z "$ac_cv_prog_ac_ct_CPP
BIN
" && ac_cv_prog_ac_ct_CPP
BIN
="cpp"
fi
fi
ac_ct_CPP=$ac_cv_prog_ac_ct_CPP
if test -n "$ac_ct_CPP"; then
echo "$as_me:$LINENO: result: $ac_ct_CPP" >&5
echo "${ECHO_T}$ac_ct_CPP" >&6
ac_ct_CPP
BIN
=$ac_cv_prog_ac_ct_CPP
BIN
if test -n "$ac_ct_CPP
BIN
"; then
echo "$as_me:$LINENO: result: $ac_ct_CPP
BIN
" >&5
echo "${ECHO_T}$ac_ct_CPP
BIN
" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
CPP=$ac_ct_CPP
CPP
BIN
=$ac_ct_CPP
BIN
else
CPP="$ac_cv_prog_CPP"
CPP
BIN
="$ac_cv_prog_CPP
BIN
"
fi
...
...
@@ -20155,9 +20155,10 @@ s,@OBJEXT@,$OBJEXT,;t t
s,@CXX@,$CXX,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
s,@ac_ct_CXX@,$ac_ct_CXX,;t t
s,@CPP@,$CPP,;t t
s,@ac_ct_CPP@,$ac_ct_CPP,;t t
s,@CPP
BIN
@,$CPP
BIN
,;t t
s,@ac_ct_CPP
BIN
@,$ac_ct_CPP
BIN
,;t t
s,@TOOLSDIR@,$TOOLSDIR,;t t
s,@CPP@,$CPP,;t t
s,@X_CFLAGS@,$X_CFLAGS,;t t
s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
s,@X_LIBS@,$X_LIBS,;t t
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
2
View file @
a631ef63
...
...
@@ -42,8 +42,8 @@ AC_CANONICAL_HOST
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_CXX
dnl We can't use AC_PROG_CPP, it uses by default $(CC) -E
AC_CHECK_TOOL(CPP,cpp,cpp)
dnl We can't use AC_PROG_CPP
for winegcc
, it uses by default $(CC) -E
AC_CHECK_TOOL(CPP
BIN
,cpp,cpp)
AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
[if test -z "$with_wine_tools"; then
...
...
This diff is collapsed.
Click to expand it.
tools/winegcc/Makefile.in
+
1
−
1
View file @
a631ef63
...
...
@@ -5,7 +5,7 @@ DEFS = \
-DDLLFLAGS
=
"
\"
@DLLFLAGS@
\"
"
\
-DLDDLLFLAGS
=
"
\"
$(
LDDLLFLAGS
)
\"
"
\
-DCC
=
"
\"
$(
CC
)
\"
"
\
-DCPP
=
"
\"
$(
CPP
)
\"
"
\
-DCPP
=
"
\"
@
CPP
BIN@
\"
"
\
-DCXX
=
"
\"
$(
CXX
)
\"
"
TOPSRCDIR
=
@top_srcdir@
...
...
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