Changeset 978

Timestamp:

11/01/08 13:27:53 (4 years ago)

Author:

Freddie Akeroyd

Message:

Add IDL to autoconf via --with-idlroot
Refs #100.

Location:

trunk

Files:

• bindings/Makefile.am (modified) (1 diff)
• bindings/idl/Makefile (deleted)
• bindings/idl/Makefile.am (added)
• configure.ac (modified) (4 diffs)

trunk/bindings/Makefile.am

@@ -39 +39 @@
 SWIGSUB = swig
 endif
-SUBDIRS = $(F77SUB) $(F90SUB) $(JAVASUB) $(SWIGSUB)
+if HAVE_IDL
+IDLSUB = idl
+endif
+SUBDIRS = $(F77SUB) $(F90SUB) $(JAVASUB) $(SWIGSUB) $(IDLSUB)

trunk/configure.ac

@@ -175 +175 @@
         [if test $withval != no; then CBFLIBROOT=$withval; fi])
 AM_CONDITIONAL(HAVE_CBFLIB, [test "$CBFLIBROOT" != ""])
+
+AC_SUBST(IDLROOT)
+AC_ARG_WITH([idlroot],
+        AC_HELP_STRING([--with-idlroot=/path/to/idlroot],
+                       [Specify location of idl files]),
+        [if test $withval != no; then IDLROOT=$withval; fi])
+AM_CONDITIONAL(HAVE_IDL, [test "$IDLROOT" != ""])
 
 AC_SUBST(FCFLAGS)
@@ -609 +616 @@
                 bindings/java/Makefile
                 bindings/swig/Makefile
+                bindings/idl/Makefile
                 contrib/Makefile
                 contrib/applications/Makefile
@@ -625 +633 @@
 F90BINDING=`if test -n "$FC" ; then echo yes ; else echo no ; fi`
 JAVABINDING=`if test -n "$JAVAC" ; then echo yes ; else echo no ; fi` 
+IDLBINDING=`if test -n "$IDLROOT" ; then echo yes ; else echo no ; fi` 
 if test -n "$SWIG" ; then 
     SWIGBINDING="yes ("
@@ -657 +666 @@
                 JAVA:          ${JAVABINDING} (--with-java-home=${javaroot}, JAVA=${JAVA}, JAVAC=${JAVAC}, JAVAH=${JAVAH})
                 SWIG:          ${SWIGBINDING}
+                IDL:           ${IDLBINDING} (--with-idlroot=${IDLROOT})
 
 Please check whether the configuration I detected matches what you would