65ceb81162
o Add additional MASTER_SITES o Depend on mplayer-skins if WITH_GUI since GUI does not work without a skin o Added option WITH_XANIM PR: 33604 Submitted by: MAINTAINER, Alan Eldridge <ports@geeksrus.net> Reviewed by: pat
78 lines
2.3 KiB
Text
78 lines
2.3 KiB
Text
--- configure.old Fri Jan 4 23:48:35 2002
|
|
+++ configure Sat Jan 5 00:26:19 2002
|
|
@@ -415,19 +415,10 @@
|
|
|
|
# Try to find the available options for the current CPU
|
|
if x86 ; then
|
|
- if test -r /proc/cpuinfo ; then
|
|
- # linux with /proc mounted, extract cpu information from it
|
|
- _cpuinfo="cat /proc/cpuinfo"
|
|
- elif test -r /compat/linux/proc/cpuinfo ; then
|
|
- # FreeBSD with linux emulation /proc mounted,
|
|
- # extract cpu information from it
|
|
- _cpuinfo="cat /compat/linux/proc/cpuinfo"
|
|
- else
|
|
# all other OS try to extract cpu information from a small helper
|
|
# program TOOLS/cpuinfo instead
|
|
$_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
|
|
_cpuinfo="TOOLS/cpuinfo"
|
|
- fi
|
|
|
|
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
|
|
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
|
|
@@ -1135,14 +1126,7 @@
|
|
int main(void) { (void) malloc(0); return 0; }
|
|
EOF
|
|
_malloc=no
|
|
-cc_check && _malloc=yes
|
|
-if test "$_malloc" = yes ; then
|
|
- _def_malloc='#define HAVE_MALLOC_H 1'
|
|
-else
|
|
- _def_malloc='#undef HAVE_MALLOC_H'
|
|
-fi
|
|
-# malloc.h emits a warning in FreeBSD
|
|
-freebsd && _def_malloc='#undef HAVE_MALLOC_H'
|
|
+_def_malloc='#undef HAVE_MALLOC_H'
|
|
echores "$_malloc"
|
|
|
|
|
|
@@ -1153,12 +1137,7 @@
|
|
int main (void) { (void) memalign(64, sizeof(char)); return 0; }
|
|
EOF
|
|
_memalign=no
|
|
-cc_check && _memalign=yes
|
|
-if test "$_memalign" = yes ; then
|
|
- _def_memalign='#define HAVE_MEMALIGN 1'
|
|
-else
|
|
- _def_memalign='#undef HAVE_MEMALIGN'
|
|
-fi
|
|
+_def_memalign='#undef HAVE_MEMALIGN'
|
|
echores "$_memalign"
|
|
|
|
|
|
@@ -1235,15 +1214,7 @@
|
|
void* func(void *arg) { return arg; }
|
|
int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
|
|
EOF
|
|
-if ( cc_check && $TMPO ) ; then # QNX
|
|
- _ld_pthread=''
|
|
-elif ( cc_check -lpthread && $TMPO ) ; then
|
|
- _ld_pthread='-lpthread'
|
|
-elif ( cc_check -pthread && $TMPO ) ; then
|
|
- _ld_pthread='-pthread'
|
|
-else
|
|
- die "Lib pthread not found. (needed by windows and networking stuff)"
|
|
-fi
|
|
+_ld_pthread="${PTHREAD_LIBS}"
|
|
echores "yes (using $_ld_pthread)"
|
|
|
|
|
|
@@ -2692,7 +2663,7 @@
|
|
CFLAGS="$CFLAGS -D_REENTRANT"
|
|
elif bsd ; then
|
|
# FIXME bsd needs this so maybe other OS'es
|
|
- CFLAGS="$CFLAGS -D_THREAD_SAFE"
|
|
+ CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
|
|
fi
|
|
|
|
# 64 bit file offsets?
|