fix GDSS_INCLUDES for building gdss from the moira sources case

diff --git a/configure b/configure
index 0091ec1f45ae3ea2bb3e3f572c490372659966d1..a1cf1b24b6b9623a91557a8fb4729e12705c9ac4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1686,7 +1686,7 @@ else
         if test ! -d util; then
             mkdir util
         fi
-        GDSS_CPPFLAGS="-I$gdss/include"
+        GDSS_CPPFLAGS='-I$(SRCTOP)/util/gdss/include'
         GDSS_LIBS='-L$(BUILDTOP)/util/gdss/lib -lgdss'
      else
          gdss=no
@@ -2552,6 +2552,20 @@ fi
     esac
 
 
+
+    
+    case $CPPFLAGS in
+       *-I'$(srcdir)'*) ;;
+       *) CPPFLAGS=-I'$(srcdir)'\ $CPPFLAGS ;;
+    esac
+
+    
+    case $PRO_C_INCLUDES in
+       *INCLUDE='$(srcdir)'*) ;;
+       *) PRO_C_INCLUDES=INCLUDE='$(srcdir)'\ $PRO_C_INCLUDES ;;
+    esac
+
+
 LDFLAGS="$LDFLAGS -L\$(BUILDTOP)/lib $LIBPATH"
 KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS"
 LIBS="-lmoira $KLIBS"

diff --git a/configure.in b/configure.in
index cf8400061ab635b5fe492e7a52655d1358eb6284..3bdb6d16f0ea4295efa0d6ca817fbead7845eeda 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -169,7 +169,7 @@ AC_ARG_WITH(gdss,
         if test ! -d util; then
             mkdir util
         fi
-        GDSS_CPPFLAGS="-I$gdss/include"
+        GDSS_CPPFLAGS='-I$(SRCTOP)/util/gdss/include'
         GDSS_LIBS='-L$(BUILDTOP)/util/gdss/lib -lgdss'
      else
          gdss=no