Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f6b7894d
Commit
f6b7894d
authored
Dec 30, 2001
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Duh. Reverted H�kan's patch. Adding the same target three times isn't a good idea.
parent
0fe1e77a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
17 deletions
+25
-17
configure
configure
+17
-13
configure.in
configure.in
+8
-4
No files found.
configure
View file @
f6b7894d
...
@@ -5902,21 +5902,22 @@ fi
...
@@ -5902,21 +5902,22 @@ fi
# now look for the gtk.h header
# now look for the gtk.h header
saved_CPPFLAGS
=
$CPPFLAGS
saved_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$CFLAGS_GTK
"
CPPFLAGS
=
"
$CPPFLAGS
$CFLAGS_GTK
"
ac_cv_gtk_headers
=
yes
for
ac_hdr
in
gtk/gtk.h glib.h gdk/gdk.h
for
ac_hdr
in
gtk/gtk.h glib.h gdk/gdk.h
do
do
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
"configure:591
0
: checking for
$ac_hdr
"
>
&5
echo
"configure:591
1
: checking for
$ac_hdr
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 591
5
"configure"
#line 591
6
"configure"
#include "confdefs.h"
#include "confdefs.h"
#include <
$ac_hdr
>
#include <
$ac_hdr
>
EOF
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:592
0
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
{
(
eval echo
configure:592
1
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
if
test
-z
"
$ac_err
"
;
then
rm
-rf
conftest
*
rm
-rf
conftest
*
...
@@ -5937,16 +5938,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
...
@@ -5937,16 +5938,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
#define
$ac_tr_hdr
1
#define
$ac_tr_hdr
1
EOF
EOF
PLUGINS
=
"
${
PLUGINS
}
gtk"
ALIASES
=
"
${
ALIASES
}
gvlc"
else
else
echo
"
$ac_t
""no"
1>&6
echo
"
$ac_t
""no"
1>&6
echo
"Cannot find gtk development headers."
ac_cv_gtk_headers
=
no
echo
"Cannot find gtk development headers."
fi
fi
done
done
if
test
"x
$ac_cv_gtk_headers
"
=
xyes
then
PLUGINS
=
"
${
PLUGINS
}
gtk"
ALIASES
=
"
${
ALIASES
}
gvlc"
fi
CPPFLAGS
=
$saved_CPPFLAGS
CPPFLAGS
=
$saved_CPPFLAGS
fi
fi
...
@@ -5957,17 +5961,17 @@ if test "${enable_alsa+set}" = set; then
...
@@ -5957,17 +5961,17 @@ if test "${enable_alsa+set}" = set; then
then
then
ac_safe
=
`
echo
"alsa/asoundlib.h"
|
sed
'y%./+-%__p_%'
`
ac_safe
=
`
echo
"alsa/asoundlib.h"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for alsa/asoundlib.h""...
$ac_c
"
1>&6
echo
$ac_n
"checking for alsa/asoundlib.h""...
$ac_c
"
1>&6
echo
"configure:596
1
: checking for alsa/asoundlib.h"
>
&5
echo
"configure:596
5
: checking for alsa/asoundlib.h"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 59
66
"configure"
#line 59
70
"configure"
#include "confdefs.h"
#include "confdefs.h"
#include <alsa/asoundlib.h>
#include <alsa/asoundlib.h>
EOF
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:597
1
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
{
(
eval echo
configure:597
5
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
if
test
-z
"
$ac_err
"
;
then
rm
-rf
conftest
*
rm
-rf
conftest
*
...
@@ -5984,7 +5988,7 @@ fi
...
@@ -5984,7 +5988,7 @@ fi
if
eval
"test
\"
`
echo
'$ac_cv_header_'
$ac_safe
`
\"
= yes"
;
then
if
eval
"test
\"
`
echo
'$ac_cv_header_'
$ac_safe
`
\"
= yes"
;
then
echo
"
$ac_t
""yes"
1>&6
echo
"
$ac_t
""yes"
1>&6
echo
$ac_n
"checking for main in -lasound""...
$ac_c
"
1>&6
echo
$ac_n
"checking for main in -lasound""...
$ac_c
"
1>&6
echo
"configure:59
88
: checking for main in -lasound"
>
&5
echo
"configure:59
92
: checking for main in -lasound"
>
&5
ac_lib_var
=
`
echo
asound
'_'
main |
sed
'y%./+-%__p_%'
`
ac_lib_var
=
`
echo
asound
'_'
main |
sed
'y%./+-%__p_%'
`
if
eval
"test
\"
`
echo
'$''{'
ac_cv_lib_
$ac_lib_var
'+set}'
`
\"
= set"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_lib_
$ac_lib_var
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
...
@@ -5992,14 +5996,14 @@ else
...
@@ -5992,14 +5996,14 @@ else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lasound
$LIBS
"
LIBS
=
"-lasound
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line
5996
"configure"
#line
6000
"configure"
#include "confdefs.h"
#include "confdefs.h"
int main() {
int main() {
main()
main()
; return 0; }
; return 0; }
EOF
EOF
if
{
(
eval echo
configure:600
3
:
\"
$ac_link
\"
)
1>&5
;
(
eval
$ac_link
)
2>&5
;
}
&&
test
-s
conftest
${
ac_exeext
}
;
then
if
{
(
eval echo
configure:600
7
:
\"
$ac_link
\"
)
1>&5
;
(
eval
$ac_link
)
2>&5
;
}
&&
test
-s
conftest
${
ac_exeext
}
;
then
rm
-rf
conftest
*
rm
-rf
conftest
*
eval
"ac_cv_lib_
$ac_lib_var
=yes"
eval
"ac_cv_lib_
$ac_lib_var
=yes"
else
else
...
...
configure.in
View file @
f6b7894d
...
@@ -1171,12 +1171,16 @@ then
...
@@ -1171,12 +1171,16 @@ then
# now look for the gtk.h header
# now look for the gtk.h header
saved_CPPFLAGS=$CPPFLAGS
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, [
ac_cv_gtk_headers=yes
AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
ac_cv_gtk_headers=no
echo "Cannot find gtk development headers."
])
if test "x$ac_cv_gtk_headers" = xyes
then
PLUGINS="${PLUGINS} gtk"
PLUGINS="${PLUGINS} gtk"
ALIASES="${ALIASES} gvlc"
ALIASES="${ALIASES} gvlc"
],[
fi
echo "Cannot find gtk development headers."
])
CPPFLAGS=$saved_CPPFLAGS
CPPFLAGS=$saved_CPPFLAGS
fi
fi
...
...
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