acconfig.h defines for ATTRIB_NMC and ASCEND_BINARY

src/include/autoconf.h.in

configure.in	check options for the above, and define by default
configure

Makefile	re-build src/include/autoconf.h.in on 'make reconfig'
		when acconfig.h changes

src/include/conf.h   remove ATTRIB_NMC definition, and leave it
		     under the user's control at 'configure'

diff --git a/Makefile b/Makefile
index 9721776..204c225 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ include Make.inc
 SUBDIRS                = src raddb doc scripts
 WHAT_TO_MAKE   = all
 
-all: config.status
+all:
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 
 clean:
@@ -34,9 +34,6 @@ distclean: clean
                sed 's/\.in$$//' | \
                while read file; do rm -f $$file; done
 
-Make.inc: Make.inc.in
-       ./configure
-
 ######################################################################
 #
 #  Automatic remaking rules suggested by info:autoconf#Automatic_Remaking
@@ -48,7 +45,7 @@ configure: configure.in
        autoconf
 
 # autoheader might not change autoconf.h.in, so touch a stamp file
-src/include/autoconf.h.in: src/include/stamp-h.in
+src/include/autoconf.h.in: src/include/stamp-h.in acconfig.h
 src/include/stamp-h.in: configure.in acconfig.h
        autoheader
        echo timestamp > src/include/stamp-h.in

diff --git a/acconfig.h b/acconfig.h
index ed736dd..2d4016b 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -44,5 +44,8 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Make dictionary case-independant */
 #undef WITH_DICT_NOCASE
 
-/* Make dictionary case-independant */
-#undef WITH_DICT_NOCASE
+/* Use USR-style vendor specific attributes */
+#undef ATTRIB_NMC
+
+/* Include support for Ascend binary filter attributes */
+#undef ASCEND_BINARY

diff --git a/configure.in b/configure.in
index 2a2200e..e04ae39 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -166,6 +166,41 @@ AC_ARG_WITH(dict-nocase,
   esac ]
 )
 
+dnl extra argument: --with-attrib-nmc
+ATTRIB_NMC=
+AC_ARG_WITH(attrib-nmc,
+[  --with-attrib-nmc        Include USR-style vendor specific attributes (default=yes)],
+[ ATTRIB_NMC=$withval
+ case "$withval" in
+    no)
+       ;;
+    yes)
+       AC_DEFINE(ATTRIB_NMC)
+  esac ]
+)
+dnl if they haven't said to use it, do so.
+if test "$ATTRIB_NMC" = "";then
+  AC_DEFINE(ATTRIB_NMC)
+fi
+
+dnl extra argument: --with-ascend-binary
+ASCEND_BINARY=
+AC_ARG_WITH(ascend-binary,
+[  --with-ascend-binary        Include support for Ascend binary filter attributes (default=yes)],
+[ ASCEND_BINARY=$withval
+ case "$withval" in
+    no)
+       ;;
+    yes)
+       AC_DEFINE(ASCEND_BINARY)
+  esac ]
+)
+dnl if they haven't said to use it, do so.
+if test "$ASCEND_BINARY" = "";then
+  AC_DEFINE(ASCEND_BINARY)
+fi
+
+
 dnl extra argument: --with-dynamic_modules
 WITH_DYNAMIC_MODULES=yes
 AC_ARG_WITH(dynamic-modules,

diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 2729354..7318165 100644 (file)
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -44,8 +44,11 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Make dictionary case-independant */
 #undef WITH_DICT_NOCASE
 
-/* Make dictionary case-independant */
-#undef WITH_DICT_NOCASE
+/* Use USR-style vendor specific attributes */
+#undef ATTRIB_NMC
+
+/* Include support for Ascend binary filter attributes */
+#undef ASCEND_BINARY
 
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME

diff --git a/src/include/conf.h b/src/include/conf.h
index 20bc699..ede58f6 100644 (file)
--- a/src/include/conf.h
+++ b/src/include/conf.h
@@ -44,10 +44,3 @@
 #    define ASCEND_CHANNELS_PER_LINE        23
 #  endif
 #endif
-
-/*
- *     Hack for USR gear - uses a different Vendor-Specific attribute
- *     packet layout, argh.
- */
-#define ATTRIB_NMC
-