Use external/include/idl_export.h instead of external/export.h for IDL

stcorp · Jul 31, 2018 · edc44c7 · edc44c7
1 parent b5dd49e
commit edc44c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/CMakeModules/FindIDL.cmake b/CMakeModules/FindIDL.cmake
@@ -467,7 +467,7 @@ endif()
 
 
 
-set(IDL_INCLUDE_DIR_TO_LOOK ${IDL_ROOT_DIR}/external)
+set(IDL_INCLUDE_DIR_TO_LOOK ${IDL_ROOT_DIR}/external/include)
 if(_IDL_64Build)
   set(_IDL_current_suffix ${_IDL_bin_suffix_64bits})
 else()
@@ -509,7 +509,7 @@ list(APPEND _IDL_required_variables IDL_ROOT_DIR)
 # the idl library and export.h header file are required
 find_path(
   IDL_INCLUDE_DIRS
-  export.h
+  idl_export.h
   PATHS ${IDL_INCLUDE_DIR_TO_LOOK}
   NO_DEFAULT_PATH
   )

diff --git a/idl/harp_idl.c b/idl/harp_idl.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "export.h"
+#include "idl_export.h"
 
 #include "coda.h"
 #include "harp.h"

diff --git a/m4/idl.m4 b/m4/idl.m4
@@ -2,20 +2,20 @@
 # -------------
 # Check for the availability of IDL
 AC_DEFUN([ST_CHECK_IDL],
-[AC_ARG_VAR(IDL, [The IDL root directory. If not specified '/usr/local/itt/idl/idl' is assumed])
+[AC_ARG_VAR(IDL, [The IDL root directory. If not specified '/usr/local/harris/idl' is assumed])
 if test "$IDL" = "" ; then
-  IDL=/usr/local/itt/idl/idl
+  IDL=/usr/local/harris/idl
 fi
 AC_PATH_PROG(idl, idl, no, [$IDL/bin])
 old_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="-I$IDL/external $CPPFLAGS"
-AC_CHECK_HEADERS(export.h)
+CPPFLAGS="-I$IDL/external/include $CPPFLAGS"
+AC_CHECK_HEADERS(idl_export.h)
 AC_MSG_CHECKING(for IDL installation)
-if test $ac_cv_path_idl = no || test $ac_cv_header_export_h = no ; then
+if test $ac_cv_path_idl = no || test $ac_cv_header_idl_export_h = no ; then
    st_cv_have_idl=no
    CPPFLAGS=$old_CPPFLAGS
 else
    st_cv_have_idl=yes
 fi
- AC_MSG_RESULT($st_cv_have_idl)
+AC_MSG_RESULT($st_cv_have_idl)
 ])# ST_CHECK_IDL