Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

added: [ 1750007 ] initial support for configuration on FC6 - thanks …

…to tssgery

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@9955 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
commit 35f7f6dc23b3a6bb1a78a1733e640c130cf4661e 1 parent 2971892
spiff_ authored
View
5 Makefile.include.in
@@ -2,9 +2,10 @@ AR=ar
ARFLAGS=rus
RM=rm -f
-CXX=g++-4.1
-CC=gcc-4.1
+CXX=g++
+CC=gcc
CFLAGS+=@DEBUG_FLAGS@
+CFLAGS+=@LZO_INCLUDES@
DEFINES+=-D_LINUX -D_FILE_DEFINED -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @SDL_DEFINES@
.cpp.o:
View
286 configure
@@ -674,6 +674,7 @@ LIBOBJS
POW_LIB
DEBUG_FLAGS
SDL_DEFINES
+LZO_INCLUDES
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -4150,6 +4151,136 @@ echo "$as_me: error: == Could not find a required library. Please see README.lin
fi
+{ echo "$as_me:$LINENO: checking for main in -lasound" >&5
+echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6; }
+if test "${ac_cv_lib_asound_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lasound $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ 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
+ ac_cv_lib_asound_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_asound_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_main" >&5
+echo "${ECHO_T}$ac_cv_lib_asound_main" >&6; }
+if test $ac_cv_lib_asound_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBASOUND 1
+_ACEOF
+
+ LIBS="-lasound $LIBS"
+
+fi
+ # check for asound library, fedora
+
+{ echo "$as_me:$LINENO: checking for main in -llzo2" >&5
+echo $ECHO_N "checking for main in -llzo2... $ECHO_C" >&6; }
+if test "${ac_cv_lib_lzo2_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llzo2 $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ 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
+ ac_cv_lib_lzo2_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_lzo2_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_main" >&5
+echo "${ECHO_T}$ac_cv_lib_lzo2_main" >&6; }
+if test $ac_cv_lib_lzo2_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBLZO2 1
+_ACEOF
+
+ LIBS="-llzo2 $LIBS"
+
+fi
+ # check for lzo2 library, fedora
+
# Checks for header files.
@@ -5268,6 +5399,151 @@ fi
done
+for ac_header in lzo/lzo1.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 bugs@xboxmediacenter.com ##
+## --------------------------------------- ##
+_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
+
+
# Checks for typedefs, structures, and compiler characteristics.
{ echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
@@ -10981,6 +11257,13 @@ if test "$use_joystick" = "yes"; then
SDL_DEFINES="$SDL_DEFINES -DHAS_SDL_JOYSTICK"
fi
+if test -d "/usr/include/lzo"; then
+ LZO_INCLUDES="-I/usr/include/lzo"
+else
+ LZO_INCLUDES=""
+fi
+
+
ac_config_files="$ac_config_files Makefile Makefile.include"
@@ -11659,10 +11942,11 @@ LIBOBJS!$LIBOBJS$ac_delim
POW_LIB!$POW_LIB$ac_delim
DEBUG_FLAGS!$DEBUG_FLAGS$ac_delim
SDL_DEFINES!$SDL_DEFINES$ac_delim
+LZO_INCLUDES!$LZO_INCLUDES$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
View
12 configure.in
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
+AC_PREREQ(2.59)
AC_INIT("xbmc", 2.1, bugs@xboxmediacenter.com)
AC_CONFIG_HEADER([config.h])
@@ -59,12 +59,15 @@ AC_CHECK_LIB([fribidi], [main],, AC_MSG_ERROR(== Could not find a required libra
AC_CHECK_LIB([lzo], [main],, AC_MSG_ERROR(== Could not find a required library. Please see README.linux))
AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR(== Could not find a required library. Please see README.linux) )
AC_CHECK_LIB([sqlite3], [main],, AC_MSG_ERROR(== Could not find a required library. Please see README.linux))
+AC_CHECK_LIB([asound], [main]) # check for asound library, fedora
+AC_CHECK_LIB([lzo2], [main]) # check for lzo2 library, fedora
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h inttypes.h limits.h locale.h malloc.h memory.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/time.h sys/timeb.h sys/vfs.h termios.h unistd.h utime.h wchar.h wctype.h])
+AC_CHECK_HEADERS([lzo/lzo1.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STAT
@@ -138,7 +141,14 @@ if test "$use_joystick" = "yes"; then
SDL_DEFINES="$SDL_DEFINES -DHAS_SDL_JOYSTICK"
fi
+if test -d "/usr/include/lzo"; then
+ LZO_INCLUDES="-I/usr/include/lzo"
+else
+ LZO_INCLUDES=""
+fi
+
AC_SUBST(DEBUG_FLAGS)
AC_SUBST(SDL_DEFINES)
+AC_SUBST(LZO_INCLUDES)
AC_CONFIG_FILES([Makefile Makefile.include])
AC_OUTPUT
View
4 xbmc/cores/DllLoader/exports/Makefile
@@ -10,10 +10,10 @@ include ../../../../Makefile.include
-include Makefile.depend
wrapper.o : wrapper.c
- gcc-4.1 -c -g -D_LINUX -D__USE_FILE_OFFSET64 -I. -I../../../ -I../../../linux -I../../../../guilib $< -o $@
+ gcc -c -g -D_LINUX -D__USE_FILE_OFFSET64 -I. -I../../../ -I../../../linux -I../../../../guilib $< -o $@
exports_python_linux.o : exports_python_linux.cpp
- g++-4.1 -c -g -D_LINUX -D__USE_FILE_OFFSET64 -I. -I../../../ -I../../../linux -I../../../../guilib $< -o $@
+ g++ -c -g -D_LINUX -D__USE_FILE_OFFSET64 -I. -I../../../ -I../../../linux -I../../../../guilib $< -o $@
wrapper.def : wrapper.c
(echo -n "-Wl"; grep __wrap wrapper.c | grep -v bash | sed "s/.*__wrap_//g" | sed "s/(.*//g" | awk '{printf(",-wrap,%s",$$0);}') > wrapper.def
View
68 xbmc_setup_fedoracore6.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# $Header$
+# Unix shell script to setup Fedora Core 6 for development of the
+# Linux port of XBMC
+
+# note, the glew packages are from the 'dribble' repository
+# to setup the livna repo...
+# rpm -ivh http://rpm.livna.org/livna-release-6.rpm
+
+# to setup the dribble repo...
+# rpm -ivh http://dribble.org.uk/repo/dribble-release-5-3.noarch.rpm
+
+# list of all required packages
+reqd_pkgs=( \
+ gcc \
+ gcc-c++ \
+ SDL \
+ SDL-devel \
+ SDL_image \
+ SDL_image-devel \
+ SDL_gfx \
+ SDL_gfx-devel \
+ SDL_mixer \
+ SDL_mixer-devel \
+ SDL_sound \
+ SDL_sound-devel \
+ libcdio \
+ libcdio-devel \
+ fribidi \
+ fribidi-devel \
+ lzo \
+ lzo-devel \
+ freetype \
+ freetype-devel \
+ sqlite \
+ sqlite-devel \
+ libogg \
+ libogg-devel \
+ samba-client \
+ python \
+ python-devel \
+ python-sqlite \
+ curl \
+ curl-devel \
+ glew \
+ glew-devel \
+ alsa-lib-devel \
+ alsa-lib \
+)
+
+
+len=${#reqd_pkgs[*]}
+echo "Checking to see if the $len pre-reqs are installed:"
+i=0
+while [ $i -lt $len ]; do
+ # check to see if it's installed
+ rpm -q "${reqd_pkgs[$i]}"
+ if [ $? -ne 0 ]
+ then
+ echo " ${reqd_pkgs[$i]} will be installed"
+ yum install -y "${reqd_pkgs[$i]}"
+ fi
+ let i++
+done
+
+
+
Please sign in to comment.
Something went wrong with that request. Please try again.