aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-29 05:46:45 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-29 05:46:45 +0000
commit44ebc9ef773734ece0687de0733213d3baf91991 (patch)
tree6230113ec6e11ee94c036cab8da3b813d853e4ff /config.nmake
parent9fc2a85a62f52ae58ba2a13a5766ee38044fda62 (diff)
Simplify logic wrt. PANGO_INST_VERSION
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29613 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake8
1 files changed, 1 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake
index 4788b55ef5..2d5d343560 100644
--- a/config.nmake
+++ b/config.nmake
@@ -943,13 +943,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
!ERROR ? Unknown or invalid GTK_INST_VERSION
!ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.24"
-PANGO_LIB_DIR=1.5.0
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.22"
-PANGO_LIB_DIR=1.5.0
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
-PANGO_LIB_DIR=1.5.0
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
+!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16"
PANGO_LIB_DIR=1.5.0
!ELSE
!ERROR ? Unknown or invalid PANGO_INST_VERSION