hopefully this will do what Thomas wants for NO_PROTO_OPT

svn path=/trunk/; revision=23074

diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc
index 2610370ba02da12474d4e86c911231b94818c758..b58a7f4fe032112f2714e9d0c42b45fb8d029680 100644 (file)
--- a/asn1/Makefile.inc
+++ b/asn1/Makefile.inc
@@ -21,17 +21,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+ifdef NO_PROTO_OPT
+PROTO_OPT =
+else
+PROTO_OPT = -p $(PROTOCOL_NAME)
+endif
 
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-# commented out till it is fixed
-#if NO_PROTO_OPT
-#PROTO_OPT =
-#else
-PROTO_OPT = -p $(PROTOCOL_NAME)
-#endif
 
 $(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
        python $(top_srcdir)/tools/asn2wrs.py \