Reorder so that mandatory requirements appear in succession
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 26 Aug 2009 07:05:50 +0000 (07:05 +0000)
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 26 Aug 2009 07:05:50 +0000 (07:05 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29560 f5534014-38df-0310-8fa8-9805f1628bb7

config.nmake

index 0e03725d6c2d1a2d62aac191a9104d253ddab77e..74b8134f3e93124bc1e45743b603df886fbaf128 100644 (file)
@@ -173,6 +173,17 @@ PANGO_PKG=1.24.2-1
 GTK_INST_VERSION=2.16
 PANGO_INST_VERSION=1.24
 
+#
+# Mandatory for GTK >= 2: Gettext
+#
+# Set GETTEXT_DIR to the directory in which the
+# GETTEXT include files and library resides.
+#
+#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
+GETTEXT_PKG=-runtime-0.17-1
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
+GETTEXT_DLL=intl.dll
+
 #
 # Optional: WinPcap developer's pack to capture network traffic.
 #
@@ -309,16 +320,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
 #PORTAUDIO_VERSION=18
 PORTAUDIO_VERSION=19
 
-#
-# Mandatory for GTK >= 2: Gettext
-#
-# Set GETTEXT_DIR to the directory in which the
-# GETTEXT include files and library resides.
-#
-#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
-GETTEXT_PKG=-runtime-0.17-1
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
-GETTEXT_DLL=intl.dll
 #
 # Optional: AirPcap developer's pack to capture wireless network traffic
 # incl. 802.11 management frames.
@@ -393,6 +394,17 @@ PANGO_PKG=1.24.2-1
 GTK_INST_VERSION=2.16
 PANGO_INST_VERSION=1.24
 
+#
+# Mandatory for GTK >= 2: Gettext
+#
+# Set GETTEXT_DIR to the directory in which the
+# GETTEXT include files and library resides.
+#
+#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
+GETTEXT_PKG=_0.17-1_win64
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1
+GETTEXT_DLL=libintl-8.dll
+
 #
 # Optional: WinPcap developer's pack to capture network traffic.
 #
@@ -529,16 +541,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
 #PORTAUDIO_VERSION=18
 PORTAUDIO_VERSION=19
 
-#
-# Mandatory for GTK >= 2: Gettext
-#
-# Set GETTEXT_DIR to the directory in which the
-# GETTEXT include files and library resides.
-#
-#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
-GETTEXT_PKG=_0.17-1_win64
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1
-GETTEXT_DLL=libintl-8.dll
 #
 # Optional: AirPcap developer's pack to capture wireless network traffic
 # incl. 802.11 management frames.