[svn-commits] russell: branch russell/LaTeX_docs r58930 - /team/russell/LaTeX_docs/

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu Mar 15 15:19:41 MST 2007 

Author: russell
Date: Thu Mar 15 17:19:40 2007
New Revision: 58930

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58930
Log:
add configure script checking for the tool used to generate the pdf

Modified:
    team/russell/LaTeX_docs/Makefile
    team/russell/LaTeX_docs/configure
    team/russell/LaTeX_docs/configure.ac
    team/russell/LaTeX_docs/makeopts.in

Modified: team/russell/LaTeX_docs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/LaTeX_docs/Makefile?view=diff&rev=58930&r1=58929&r2=58930
==============================================================================
--- team/russell/LaTeX_docs/Makefile (original)
+++ team/russell/LaTeX_docs/Makefile Thu Mar 15 17:19:40 2007
@@ -680,6 +680,18 @@
 asterisk.pdf: doc/asterisk.pdf
 
 doc/asterisk.pdf:
-	cd doc && rubber asterisk.tex
+ifeq ($(findstring rubber,$(RUBBER)),)
+	@echo "**********************************************"
+	@echo "** You must install the \"rubber\" tool      ***"
+	@echo "** to generate the Asterisk reference PDF. ***"
+	@echo "**********************************************"
+else
+	@echo "**********************************************"
+	@echo "** The Asterisk reference PDF will now be  ***"
+	@echo "** generated.  When complete, it will be   ***"
+	@echo "** located at doc/asterisk.pdf.            ***"	
+	@echo "**********************************************"
+	@cd doc && rubber asterisk.tex
+endif
 
 .PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: team/russell/LaTeX_docs/configure
URL: http://svn.digium.com/view/asterisk/team/russell/LaTeX_docs/configure?view=diff&rev=58930&r1=58929&r2=58930
==============================================================================
--- team/russell/LaTeX_docs/configure (original)
+++ team/russell/LaTeX_docs/configure Thu Mar 15 17:19:40 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 57556 .
+# From configure.ac Revision: 58320 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -692,6 +692,7 @@
 DOT
 STRIP
 WGET
+RUBBER
 FETCH
 DOWNLOAD
 acx_pthread_config
@@ -7401,6 +7402,47 @@
 fi
 
 
+# Extract the first word of "rubber", so it can be a program name with args.
+set dummy rubber; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_RUBBER+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $RUBBER in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RUBBER="$RUBBER" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_RUBBER="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_RUBBER" && ac_cv_path_RUBBER=":"
+  ;;
+esac
+fi
+RUBBER=$ac_cv_path_RUBBER
+if test -n "$RUBBER"; then
+  { echo "$as_me:$LINENO: result: $RUBBER" >&5
+echo "${ECHO_T}$RUBBER" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
 if test "${WGET}" != ":" ; then
   DOWNLOAD=${WGET}
 else
@@ -34661,13 +34703,13 @@
 DOT!$DOT$ac_delim
 STRIP!$STRIP$ac_delim
 WGET!$WGET$ac_delim
+RUBBER!$RUBBER$ac_delim
 FETCH!$FETCH$ac_delim
 DOWNLOAD!$DOWNLOAD$ac_delim
 acx_pthread_config!$acx_pthread_config$ac_delim
 PTHREAD_CC!$PTHREAD_CC$ac_delim
 PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
 PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
-AST_DEVMODE!$AST_DEVMODE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34709,6 +34751,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+AST_DEVMODE!$AST_DEVMODE$ac_delim
 ALSA_LIB!$ALSA_LIB$ac_delim
 ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim
 ALSA_DIR!$ALSA_DIR$ac_delim
@@ -34805,7 +34848,6 @@
 QT_INCLUDE!$QT_INCLUDE$ac_delim
 QT_DIR!$QT_DIR$ac_delim
 PBX_QT!$PBX_QT$ac_delim
-RADIUS_LIB!$RADIUS_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34847,6 +34889,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+RADIUS_LIB!$RADIUS_LIB$ac_delim
 RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim
 RADIUS_DIR!$RADIUS_DIR$ac_delim
 PBX_RADIUS!$PBX_RADIUS$ac_delim
@@ -34932,7 +34975,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/russell/LaTeX_docs/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/LaTeX_docs/configure.ac?view=diff&rev=58930&r1=58929&r2=58930
==============================================================================
--- team/russell/LaTeX_docs/configure.ac (original)
+++ team/russell/LaTeX_docs/configure.ac Thu Mar 15 17:19:40 2007
@@ -146,6 +146,7 @@
 AC_PATH_PROG([DOT], [dot], :)
 AC_PATH_PROG([STRIP], [strip], :)
 AC_PATH_PROG([WGET], [wget], :)
+AC_PATH_PROG([RUBBER], [rubber], :)
 if test "${WGET}" != ":" ; then
   DOWNLOAD=${WGET}
 else

Modified: team/russell/LaTeX_docs/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/russell/LaTeX_docs/makeopts.in?view=diff&rev=58930&r1=58929&r2=58930
==============================================================================
--- team/russell/LaTeX_docs/makeopts.in (original)
+++ team/russell/LaTeX_docs/makeopts.in Thu Mar 15 17:19:40 2007
@@ -22,6 +22,7 @@
 WGET=@WGET@
 FETCH=@FETCH@
 DOWNLOAD=@DOWNLOAD@
+RUBBER=@RUBBER@
 
 BUILD_PLATFORM=@BUILD_PLATFORM@
 BUILD_CPU=@BUILD_CPU@

More information about the svn-commits mailing list