[xiph-cvs] cvs commit: theora autogen.sh

[Ralph Giles]

giles       03/06/19 17:25:42

  Modified:    .        autogen.sh
  Log:
  Try harder to find the xiph .m4 macros on the system. In particular,
  look in the default directory, $srcdir and /usr as those are also likely
  and/or good fallback places. Also, don't error if there ACLOCAL_FLAGS
  has been set in the env in the hope that it contains a useful -I line,
  as advised.
  
  Really, we should scan the -I line as well, and use --prefix if it's
  given. That is, if we wanted to try even harder.

Revision  Changes    Path
1.3       +12 -4     theora/autogen.sh

Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/theora/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.sh	10 Jun 2003 11:20:45 -0000	1.2
+++ autogen.sh	19 Jun 2003 21:25:42 -0000	1.3
@@ -48,21 +48,29 @@
 
 echo "Generating configuration files for $package, please wait...."
 
+test -f aclocal.m4 && rm aclocal.m4
 echo -n "looking for our m4 macros... "
-for dir in /usr/local/share/aclocal* /usr/local/aclocal* /sw/share/aclocal*; do
-  if test -d $dir; then
-    if ! test -z `fgrep XIPH_PATH $dir/*.m4 | wc -l`; then
+aclocaldirs="$srcdir `aclocal --print-ac-dir` \
+        /usr/local/share/aclocal* /usr/local/aclocal* \
+        /sw/share/aclocal* /usr/share/aclocal*"
+for dir in $aclocaldirs; do
+  test -d "$dir" && if ! test -z "`ls $dir | grep .m4`"; then
+    if test ! -z "`fgrep XIPH_PATH_OGG $dir/*.m4`"; then
       echo $dir
       ACLOCAL_FLAGS="-I $dir $ACLOCAL_FLAGS"
       break
     fi
   fi
+done
+if test -z "$ACLOCAL_FLAGS"; then
   echo "nope."
   echo
   echo "Please install the ogg and vorbis libraries, or add the"
   echo "location of ogg.m4 to ACLOCAL_FLAGS in the environment."
+  echo
   exit 1
-done
+fi
+
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS
 #echo "  autoheader"

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.