Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
c626491b
Commit
c626491b
authored
Aug 16, 2004
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure we check for egrep before we use it.
parent
5d91a63a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
18 deletions
+19
-18
configure
configure
+18
-18
configure.ac
configure.ac
+1
-0
No files found.
configure
View file @
c626491b
...
...
@@ -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 CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON 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 XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS EGREP
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 LDLIBWINEFLAGS 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 CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON 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
EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD 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 LDLIBWINEFLAGS 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.
...
...
@@ -5390,6 +5390,21 @@ else
echo
"
${
ECHO_T
}
no, using
$LN
"
>
&6
fi
rm
-f
conf
$$
conf
$$
.file
echo
"
$as_me
:
$LINENO
: checking for egrep"
>
&5
echo
$ECHO_N
"checking for egrep...
$ECHO_C
"
>
&6
if
test
"
${
ac_cv_prog_egrep
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
if
echo
a |
(
grep
-E
'(a|b)'
)
>
/dev/null 2>&1
then
ac_cv_prog_egrep
=
'grep -E'
else
ac_cv_prog_egrep
=
'egrep'
fi
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_prog_egrep
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_prog_egrep
"
>
&6
EGREP
=
$ac_cv_prog_egrep
# Extract the first word of "ldconfig", so it can be a program name with args.
set
dummy ldconfig
;
ac_word
=
$2
echo
"
$as_me
:
$LINENO
: checking for
$ac_word
"
>
&5
...
...
@@ -6883,22 +6898,7 @@ then
ac_save_CPPFLAGS
=
"
$CPPFLAGS
"
CPPFLAGS
=
"
$CPPFLAGS
$X_CFLAGS
"
echo
"
$as_me
:
$LINENO
: checking for egrep"
>
&5
echo
$ECHO_N
"checking for egrep...
$ECHO_C
"
>
&6
if
test
"
${
ac_cv_prog_egrep
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
if
echo
a |
(
grep
-E
'(a|b)'
)
>
/dev/null 2>&1
then
ac_cv_prog_egrep
=
'grep -E'
else
ac_cv_prog_egrep
=
'egrep'
fi
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_prog_egrep
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_prog_egrep
"
>
&6
EGREP
=
$ac_cv_prog_egrep
echo
"
$as_me
:
$LINENO
: checking for ANSI C header files"
>
&5
echo
"
$as_me
:
$LINENO
: checking for ANSI C header files"
>
&5
echo
$ECHO_N
"checking for ANSI C header files...
$ECHO_C
"
>
&6
if
test
"
${
ac_cv_header_stdc
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
...
...
@@ -20826,6 +20826,7 @@ s,@WINDRES@,$WINDRES,;t t
s,@ac_ct_WINDRES@,
$ac_ct_WINDRES
,;t t
s,@LN_S@,
$LN_S
,;t t
s,@LN@,
$LN
,;t t
s,@EGREP@,
$EGREP
,;t t
s,@LDCONFIG@,
$LDCONFIG
,;t t
s,@INSTALL_PROGRAM@,
$INSTALL_PROGRAM
,;t t
s,@INSTALL_SCRIPT@,
$INSTALL_SCRIPT
,;t t
...
...
@@ -20842,7 +20843,6 @@ s,@XFILES@,$XFILES,;t t
s,@OPENGLFILES@,
$OPENGLFILES
,;t t
s,@GLU32FILES@,
$GLU32FILES
,;t t
s,@OPENGL_LIBS@,
$OPENGL_LIBS
,;t t
s,@EGREP@,
$EGREP
,;t t
s,@GLUT_LIBS@,
$GLUT_LIBS
,;t t
s,@GLUT32FILES@,
$GLUT32FILES
,;t t
s,@NASLIBS@,
$NASLIBS
,;t t
...
...
configure.ac
View file @
c626491b
...
...
@@ -88,6 +88,7 @@ AC_CHECK_TOOL(STRIP,strip,strip)
AC_CHECK_TOOL(WINDRES,windres,false)
AC_PROG_LN_S
WINE_PROG_LN
AC_PROG_EGREP
AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH])
AC_PROG_INSTALL
dnl Prepend src dir to install path dir if it's a relative path
...
...
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