Some default names for autoconf and the like have changed in
fbsd. I also have a compile time build problem with the #def of
THROW. I've included a patch to fix both and it gets through the
compile but there's still some wonkiness because the makefile call
automake.
--Mat
--- autogen.sh.old Tue Nov 20 13:45:02 2001
+++ autogen.sh Tue Nov 20 13:43:59 2001
@@ -61,8 +61,22 @@
# Debian unstable allows to have several different versions of autoconf
# in the one system
+
+use_automake=automake
+use_aclocal=aclocal
+use_libtool=libtool
use_autoconf=autoconf
use_autoheader=autoheader
+
+findver=14
+export findver
+[ -x `which automake${findver}` ] && use_automake=`which automake${findver}`
+[ -x `which aclocal${findver}` ] && use_aclocal=`which aclocal${findver}`
+findver=213
+[ -x `which autoconf${findver}` ] && use_autoconf=`which autoconf${findver}`
+[ -x `which autoheader${findver}` ] && use_autoheader=`which autoheader${findver}`
+unset findver
+
# I think links are now OK
# Debian will use 2.50 for configure.ac files automaticaly
#( which autoconf2.50 2>/dev/null | grep -q "^/" ) && use_autoconf=autoconf2.50
@@ -76,33 +90,32 @@
DIE=1
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+($use_automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`automake' installed."
DIE=1
NO_AUTOMAKE=yes
}
-(aclocal --version) < /dev/null > /dev/null 2>&1 || {
+($use_aclocal --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: Missing \`aclocal'."
DIE=1
}
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+($use_libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed."
DIE=1
}
-
if test -z "$acdir" -a -d /usr/local/share/aclocal ; then
if !(ls -ld /usr/local/share | grep /usr/share > /dev/null 2>/dev/null ); then
- if test "`aclocal --print-ac-dir`" != "/usr/local/share/aclocal" ; then
+ if test "`$use_aclocal --print-ac-dir`" != "/usr/local/share/aclocal" ; then
INCLUDESTRING="-I /usr/local/share/aclocal"
# ACLOCAL_FLAGS=`echo $ACLOCAL_FLAGS | sed s/-I\ \/z//`
ACLOCAL_FLAGS="-I /usr/local/share/aclocal $ACLOCAL_FLAGS"
- ACLOCAL_MAINDIR=`aclocal --print-ac-dir`
+ ACLOCAL_MAINDIR=`$use_aclocal --print-ac-dir`
for FILENAME in `ls $ACLOCAL_MAINDIR`; do
if test -e /usr/local/share/aclocal/$FILENAME ; then
echo "FATAL: both $ACLOCAL_MAINDIR/$FILENAME and
/usr/local/share/aclocal/$FILENAME exist; you must manually delete one of them"
@@ -138,10 +151,10 @@
libtoolize --force $use_copy > /dev/null || ok=1
if test -z "$acdir" ; then
echo "Running aclocal $ACLOCAL_FLAGS..."
- aclocal $ACLOCAL_FLAGS || ok=1
+ $use_aclocal $ACLOCAL_FLAGS || ok=1
else
echo "Running aclocal with forced acdir: $acdir"
- aclocal --acdir=$acdir || ok=1
+ $use_aclocal --acdir=$acdir || ok=1
fi
# echo "Running autoupdate..."
# autoupdate || ok=1
@@ -150,7 +163,7 @@
echo "Running autoconf..."
$use_autoconf || ok=1
echo "Running automake..."
-automake $use_copy --add-missing --foreign || ok=1
+$use_automake $use_copy --add-missing --foreign || ok=1
if [ "${ok}" -eq 0 ]; then
echo "Now you are ready to run ./configure"
@@ -162,11 +175,11 @@
echo " automake 1.4 or better"
echo " autoconf 2.52 or better"
echo "Your installed version:"
- libtool --version | head -1
- automake --version | head -1
- autoconf --version | head -1
+ $use_libtool --version | head -1
+ $use_automake --version | head -1
+ $use_autoconf --version | head -1
echo "Report aclocal = "
- aclocal --print-ac-dir
+ $use_aclocal --print-ac-dir
echo "Please report your problem on [EMAIL PROTECTED]"
echo "with this log of build process together with system description."
fi
--- libmmxnow/autogen.sh.old Tue Oct 2 21:24:28 2001
+++ libmmxnow/autogen.sh Tue Nov 20 13:57:06 2001
@@ -8,6 +8,9 @@
# Debian unstable allows to have several different versions of autoconf
# in the one system
+use_automake=automake
+use_aclocal=aclocal
+use_libtool=libtool
use_autoconf=autoconf
use_autoheader=autoheader
# I think links are now OK
@@ -16,6 +19,14 @@
# Debian will use 2.50 for configure.ac files automaticaly
#( which autoconf2.50 2>/dev/null | grep -q "^/" ) && use_autoconf=autoconf2.50
#( which autoheader2.50 2>/dev/null | grep -q "^/" ) && use_autoheader=autoheader2.50
+findver=14
+export findver
+[ -x `which automake${findver}` ] && use_automake=`which automake${findver}`
+[ -x `which aclocal${findver}` ] && use_aclocal=`which aclocal${findver}`
+findver=213
+[ -x `which autoconf${findver}` ] && use_autoconf=`which autoconf${findver}`
+[ -x `which autoheader${findver}` ] && use_autoheader=`which autoheader${findver}`
+unset findver
DIE=0
@@ -25,20 +36,20 @@
DIE=1
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+($use_automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`automake' installed."
DIE=1
NO_AUTOMAKE=yes
}
-(aclocal --version) < /dev/null > /dev/null 2>&1 || {
+($use_aclocal --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: Missing \`aclocal'."
DIE=1
}
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+($use_libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed."
DIE=1
@@ -47,9 +58,9 @@
if [ -d /usr/local/share/aclocal ]; then
if !(ls -ld /usr/local/share | grep /usr/share > /dev/null 2>/dev/null ); then
- if [ "`aclocal --print-ac-dir`" != "/usr/local/share/aclocal" ]; then
+ if [ "`$use_aclocal --print-ac-dir`" != "/usr/local/share/aclocal" ]; then
ACLOCAL_FLAGS="-I /usr/local/share/aclocal $ACLOCAL_FLAGS"
- ACLOCAL_MAINDIR=`aclocal --print-ac-dir`
+ ACLOCAL_MAINDIR=`$use_aclocal --print-ac-dir`
for FILENAME in `ls $ACLOCAL_MAINDIR`; do
# echo $FILENAME
if [ -e /usr/local/share/aclocal/$FILENAME ]; then
@@ -70,7 +81,7 @@
echo "Running libtoolize..."
libtoolize --force $use_copy >/dev/null || ok=1
echo "Running aclocal $ACLOCAL_FLAGS..."
-aclocal $ACLOCAL_FLAGS || ok=1
+$use_aclocal $ACLOCAL_FLAGS || ok=1
# echo "Running autoupdate..."
# autoupdate || ok=1
echo "Running autoheader..."
@@ -78,14 +89,14 @@
echo "Running autoconf..."
$use_autoconf || ok=1
echo "Running automake..."
-automake --add-missing $use_copy --foreign || ok=1
+$use_automake --add-missing $use_copy --foreign || ok=1
if [ "${ok}" -eq 0 ]; then
echo "Now you are ready to run ./configure"
else
echo "Problems detected. Please investigate."
echo "Report aclocal = "
- aclocal --print-ac-dir
+ $use_aclocal --print-ac-dir
echo "Please report your problem on [EMAIL PROTECTED]"
echo "your log of build - together with these files:"
echo "aclocal.m4 config.guess config.sub configure"
--- include/default.h.old Tue Nov 20 14:05:42 2001
+++ include/default.h Tue Nov 20 14:07:41 2001
@@ -57,14 +57,9 @@
typedef int Display;
#endif
-#ifdef __cplusplus
-//#include <avm_stl.h>
-#else /* ! __cplusplus */
#ifndef __THROW
#define __THROW
-#endif
-#endif /* __cplusplus */
//#define std avm
-
+#endif /* WIN */
#endif /* AVIFILE_DEFAULT_H */
