Changeset 1829

Timestamp:

09/30/07 17:03:38 (6 years ago)

Author:

sam

Message:

• Further refined the tetex/texlive detection method.
• Support for autotools-1.10.

Location:

libcaca/trunk

Files:

• bootstrap (modified) (1 diff)
• configure.ac (modified) (1 diff)

libcaca/trunk/bootstrap

@@ -32 +32 @@
 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
-  if automake${v} --version >/dev/null 2>&1; then
-    amvers="${v}"
-    break
-  fi
+for n in 10 9 8 7 6 5; do
+  for v in "-1.${n}" "1${n}"; do
+    if automake${v} --version >/dev/null 2>&1; then
+      amvers="${v}"
+      break
+    fi
+  done
 done
 

libcaca/trunk/configure.ac

@@ -350 +350 @@
       LATEX="no"
     fi
-    AC_MSG_CHECKING(for a4wide.sty)
-    if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
+    AC_MSG_CHECKING(for a4.sty)
+    if test "$(find /usr/share/texmf* -name 'a4.sty')" != ""; then
       AC_MSG_RESULT(yes)
-    elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
-      AC_MSG_RESULT(yes)
-    elif test -f /usr/share/texmf-texlive/tex/latex/ltxmisc/a4wide.sty; then
-      AC_MSG_RESULT(yes)
+      AC_MSG_CHECKING(for a4wide.sty)
+      if test "$(find /usr/share/texmf* -name 'a4wide.sty')" != ""; then
+        AC_MSG_RESULT(yes)
+      else
+        LATEX="no"
+        AC_MSG_RESULT(no)
+      fi
     else
       LATEX="no"