Fix for systems where hyperref doesn't invoke ifpdf.sty.

3 files changed, 4 insertions, 2 deletions

diff --git a/sphinx/texinputs/howto.cls b/sphinx/texinputs/howto.cls
index 8c98a8de..2f74c66f 100644
--- a/sphinx/texinputs/howto.cls
+++ b/sphinx/texinputs/howto.cls
@@ -20,7 +20,7 @@
 %
 \renewcommand{\maketitle}{
   \rule{\textwidth}{1pt}
-  \ifpdf
+  \ifsphinxpdfoutput
     \begingroup
     % This \def is required to deal with multi-line authors; it
     % changes \\ to ', ' (comma-space), making it pass muster for
diff --git a/sphinx/texinputs/manual.cls b/sphinx/texinputs/manual.cls
index e4712c81..9a4c7606 100644
--- a/sphinx/texinputs/manual.cls
+++ b/sphinx/texinputs/manual.cls
@@ -24,7 +24,7 @@
     \let\footnotesize\small
     \let\footnoterule\relax
     \rule{\textwidth}{1pt}%
-    \ifpdf
+    \ifsphinxpdfoutput
       \begingroup
       % This \def is required to deal with multi-line authors; it
       % changes \\ to ', ' (comma-space), making it pass muster for
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index ae6ad3e8..f83bae06 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -42,10 +42,12 @@
 \fi
 
 % for PDF output, use colors and maximal compression
+\newif\ifsphinxpdfoutput\sphinxpdfoutputfalse
 \ifx\pdfoutput\undefined\else\ifcase\pdfoutput
   \let\py@NormalColor\relax
   \let\py@TitleColor\relax
 \else
+  \sphinxpdfoutputtrue
   \input{pdfcolor}
   \def\py@NormalColor{\color[rgb]{0.0,0.0,0.0}}
   \def\py@TitleColor{\color{TitleColor}}