ChangeSet ID: 1120224074952441089860262
CVSROOT: /cvsroot/wine
Module name: docs
Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/07/01 06:21:14
Modified files:
. : configure configure.ac
Log message:
Francois Gouget <fgouget(a)codeweavers.com>
Check for nsgmls and warn the user if it is missing.
Old revision New revision Changes Path
1.3 1.4 +54 -1 docs/configure
1.3 1.4 +12 -0 docs/configure.ac
Index: docs/configure
diff -u -p docs/configure:1.3 docs/configure:1.4
--- docs/configure 1 Jul 2005 13:21:14 -0000
+++ /dev/null 1 Jul 2005 13:21:14 -0000
@@ -273,7 +273,7 @@ PACKAGE_VERSION='20050419'
PACKAGE_STRING='Wine 20050419'
PACKAGE_BUGREPORT='wine-devel(a)winehq.org'
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE DB2HTML DB2PDF DB2PS DB2TXT LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE DB2HTML DB2PDF DB2PS DB2TXT NSGMLS LIBOBJS LTLIBOBJS'
ac_subst_files='MAKE_RULES'
# Initialize some variables set by options.
@@ -1423,6 +1423,47 @@ fi
done
test -n "$DB2TXT" || DB2TXT="false"
+for ac_prog in nsgmls
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; 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_prog_NSGMLS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$NSGMLS"; then
+ ac_cv_prog_NSGMLS="$NSGMLS" # Let the user override the test.
+else
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_NSGMLS="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+NSGMLS=$ac_cv_prog_NSGMLS
+if test -n "$NSGMLS"; then
+ echo "$as_me:$LINENO: result: $NSGMLS" >&5
+echo "${ECHO_T}$NSGMLS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$NSGMLS" && break
+done
+test -n "$NSGMLS" || NSGMLS="false"
+
MAKE_RULES=Make.rules
@@ -2073,6 +2114,7 @@ s,@DB2HTML@,$DB2HTML,;t t
s,@DB2PDF@,$DB2PDF,;t t
s,@DB2PS@,$DB2PS,;t t
s,@DB2TXT@,$DB2TXT,;t t
+s,@NSGMLS@,$NSGMLS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
/@MAKE_RULES@/r $MAKE_RULES
@@ -2353,6 +2395,17 @@ then
echo "*** - SUSE: docbook-utils"
fi
+if test "$NSGMLS" = "false"
+then
+ echo
+ echo "*** Note: Your system appears to be missing the nsgmls parser"
+ echo "*** which is needed to build the translated documentation using po4a."
+ echo "*** To remedy this you will need one of the following packages"
+ echo "*** - Debian: sp"
+ echo "*** - Fedora Core: openjade"
+ echo "*** - SUSE: opensp"
+fi
+
echo
echo "Configure finished. Do '${ac_make}' to compile the documentation."
echo
Index: docs/configure.ac
diff -u -p docs/configure.ac:1.3 docs/configure.ac:1.4
--- docs/configure.ac 1 Jul 2005 13:21:14 -0000
+++ /dev/null 1 Jul 2005 13:21:14 -0000
@@ -12,6 +12,7 @@ AC_CHECK_PROGS(DB2HTML, docbook2html db2
AC_CHECK_PROGS(DB2PDF, docbook2pdf db2pdf, false)
AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
AC_CHECK_PROGS(DB2TXT, docbook2txt db2txt, false)
+AC_CHECK_PROGS(NSGMLS, nsgmls, false)
dnl **** Generate output files ****
@@ -39,6 +40,17 @@ then
echo "*** - SUSE: docbook-utils"
fi
+if test "$NSGMLS" = "false"
+then
+ echo
+ echo "*** Note: Your system appears to be missing the nsgmls parser"
+ echo "*** which is needed to build the translated documentation using po4a."
+ echo "*** To remedy this you will need one of the following packages"
+ echo "*** - Debian: sp"
+ echo "*** - Fedora Core: openjade"
+ echo "*** - SUSE: opensp"
+fi
+
echo
echo "Configure finished. Do '${ac_make}' to compile the documentation."
echo