mirror of https://code.videolan.org/videolan/vlc
* ./configure.in: gtk*-config detection fix for FreeBSD.
This commit is contained in:
Sam Hocevar
parent
8cc8d9579d
commit
cba6a24eca
|
|
@ -7512,10 +7512,49 @@ if test "${with_gtk_config_path+set}" = set; then
|
|||
fi
|
||||
|
||||
# look for gtk-config
|
||||
# Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
set dummy gtk-config; ac_word=$2
|
||||
# Extract the first word of "gtk12-config", so it can be a program name with args.
|
||||
set dummy gtk12-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:7519: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
case "$GTK12_CONFIG" in
|
||||
/*)
|
||||
ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_GTK12_CONFIG="$GTK12_CONFIG" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$GTK_PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_path_GTK12_CONFIG="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
test -z "$ac_cv_path_GTK12_CONFIG" && ac_cv_path_GTK12_CONFIG="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
GTK12_CONFIG="$ac_cv_path_GTK12_CONFIG"
|
||||
if test -n "$GTK12_CONFIG"; then
|
||||
echo "$ac_t""$GTK12_CONFIG" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
GTK_CONFIG=${GTK12_CONFIG}
|
||||
if test x${GTK_CONFIG} = xno
|
||||
then
|
||||
# Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
set dummy gtk-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:7558: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -7548,7 +7587,8 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test -x ${GTK_CONFIG}
|
||||
fi
|
||||
if test x${GTK_CONFIG} != xno
|
||||
then
|
||||
if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null
|
||||
then
|
||||
|
|
@ -7556,26 +7596,25 @@ fi
|
|||
fi
|
||||
CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`"
|
||||
LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
|
||||
fi
|
||||
# now look for the gtk.h header
|
||||
saved_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
|
||||
ac_cv_gtk_headers=yes
|
||||
for ac_hdr in gtk/gtk.h glib.h gdk/gdk.h
|
||||
# now look for the gtk.h header
|
||||
saved_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
|
||||
ac_cv_gtk_headers=yes
|
||||
for ac_hdr in gtk/gtk.h glib.h gdk/gdk.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:7569: checking for $ac_hdr" >&5
|
||||
echo "configure:7608: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7574 "configure"
|
||||
#line 7613 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:7579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:7618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -7599,17 +7638,18 @@ EOF
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
ac_cv_gtk_headers=no
|
||||
echo "Cannot find gtk development headers."
|
||||
|
||||
echo "Cannot find gtk development headers."
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
if test "x$ac_cv_gtk_headers" = xyes
|
||||
then
|
||||
PLUGINS="${PLUGINS} gtk"
|
||||
ALIASES="${ALIASES} gvlc"
|
||||
if test "x$ac_cv_gtk_headers" = xyes
|
||||
then
|
||||
PLUGINS="${PLUGINS} gtk"
|
||||
ALIASES="${ALIASES} gvlc"
|
||||
fi
|
||||
CPPFLAGS=$saved_CPPFLAGS
|
||||
fi
|
||||
CPPFLAGS=$saved_CPPFLAGS
|
||||
fi
|
||||
|
||||
# Check whether --enable-x11 or --disable-x11 was given.
|
||||
|
|
@ -7632,17 +7672,17 @@ if test x$enable_x11 != xno &&
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:7636: checking for $ac_hdr" >&5
|
||||
echo "configure:7676: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7641 "configure"
|
||||
#line 7681 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:7646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:7686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -7695,17 +7735,17 @@ if test x$enable_xvideo != xno &&
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:7699: checking for $ac_hdr" >&5
|
||||
echo "configure:7739: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7704 "configure"
|
||||
#line 7744 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:7709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:7749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -7729,7 +7769,7 @@ EOF
|
|||
saved_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
|
||||
echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
|
||||
echo "configure:7733: checking for XvSetPortAttribute in -lXv_pic" >&5
|
||||
echo "configure:7773: checking for XvSetPortAttribute in -lXv_pic" >&5
|
||||
ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -7737,7 +7777,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXv_pic $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7741 "configure"
|
||||
#line 7781 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -7748,7 +7788,7 @@ int main() {
|
|||
XvSetPortAttribute()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:7792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -7795,17 +7835,17 @@ if test x$enable_lirc = xyes
|
|||
then
|
||||
ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6
|
||||
echo "configure:7799: checking for lirc/lirc_client.h" >&5
|
||||
echo "configure:7839: checking for lirc/lirc_client.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7804 "configure"
|
||||
#line 7844 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <lirc/lirc_client.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:7809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:7849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -7822,7 +7862,7 @@ fi
|
|||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6
|
||||
echo "configure:7826: checking for lirc_init in -llirc_client" >&5
|
||||
echo "configure:7866: checking for lirc_init in -llirc_client" >&5
|
||||
ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -7830,7 +7870,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-llirc_client $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7834 "configure"
|
||||
#line 7874 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -7841,7 +7881,7 @@ int main() {
|
|||
lirc_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:7885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -7881,17 +7921,17 @@ if test "${enable_alsa+set}" = set; then
|
|||
then
|
||||
ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
|
||||
echo "configure:7885: checking for alsa/asoundlib.h" >&5
|
||||
echo "configure:7925: checking for alsa/asoundlib.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7890 "configure"
|
||||
#line 7930 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alsa/asoundlib.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:7895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:7935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -7908,7 +7948,7 @@ fi
|
|||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
|
||||
echo "configure:7912: checking for main in -lasound" >&5
|
||||
echo "configure:7952: checking for main in -lasound" >&5
|
||||
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -7916,14 +7956,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lasound $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7920 "configure"
|
||||
#line 7960 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:7967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -8282,6 +8322,7 @@ s%@SDL12_CONFIG@%$SDL12_CONFIG%g
|
|||
s%@SDL11_CONFIG@%$SDL11_CONFIG%g
|
||||
s%@SDL_CONFIG@%$SDL_CONFIG%g
|
||||
s%@GNOME_CONFIG@%$GNOME_CONFIG%g
|
||||
s%@GTK12_CONFIG@%$GTK12_CONFIG%g
|
||||
s%@GTK_CONFIG@%$GTK_CONFIG%g
|
||||
s%@DATA_PATH@%$DATA_PATH%g
|
||||
s%@PLUGIN_PATH@%$PLUGIN_PATH%g
|
||||
|
|
|
|||
37
configure.in
37
configure.in
|
|
@ -1333,8 +1333,13 @@ then
|
|||
GTK_PATH=$withval:$PATH
|
||||
fi ])
|
||||
# look for gtk-config
|
||||
AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH)
|
||||
if test -x ${GTK_CONFIG}
|
||||
AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, $GTK_PATH)
|
||||
GTK_CONFIG=${GTK12_CONFIG}
|
||||
if test x${GTK_CONFIG} = xno
|
||||
then
|
||||
AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH)
|
||||
fi
|
||||
if test x${GTK_CONFIG} != xno
|
||||
then
|
||||
if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null
|
||||
then
|
||||
|
|
@ -1342,21 +1347,21 @@ then
|
|||
fi
|
||||
CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`"
|
||||
LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
|
||||
# now look for the gtk.h header
|
||||
saved_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
|
||||
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"
|
||||
ALIASES="${ALIASES} gvlc"
|
||||
fi
|
||||
CPPFLAGS=$saved_CPPFLAGS
|
||||
fi
|
||||
# now look for the gtk.h header
|
||||
saved_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
|
||||
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"
|
||||
ALIASES="${ALIASES} gvlc"
|
||||
fi
|
||||
CPPFLAGS=$saved_CPPFLAGS
|
||||
fi
|
||||
|
||||
dnl
|
||||
|
|
|
|||
Loading…
Reference in New Issue