Added NTL-interface guff to configure and Makefile.in.

Author: wbhart

Makefile.in

@@ -1,9 +1,9 @@
-LIBS=-L$(CURDIR) -L$(FLINT_MPIR_LIB_DIR) -L$(FLINT_MPFR_LIB_DIR) -lflint -lmpir -lmpfr -lm
-LIBS2=-L$(FLINT_MPIR_LIB_DIR) -L$(FLINT_MPFR_LIB_DIR) -lmpir -lmpfr -lm
-INCS=-I$(CURDIR) -I$(FLINT_MPIR_INCLUDE_DIR) -I$(FLINT_MPFR_INCLUDE_DIR)
+LIBS=-L$(CURDIR) -L$(FLINT_MPIR_LIB_DIR) -L$(FLINT_MPFR_LIB_DIR) -L$(FLINT_NTL_LIB_DIR) -lflint -lmpir -lmpfr -lm
+LIBS2=-L$(FLINT_MPIR_LIB_DIR) -L$(FLINT_MPFR_LIB_DIR) -L$(FLINT_NTL_LIB_DIR) -lmpir -lmpfr -lm
+INCS=-I$(CURDIR) -I$(FLINT_MPIR_INCLUDE_DIR) -I$(FLINT_MPFR_INCLUDE_DIR) -I$(FLINT_NTL_INCLUDE_DIR)
 LINKLIBS=
 
-LD_LIBRARY_PATH:=${CURDIR}:${FLINT_MPFR_LIB_DIR}:${FLINT_MPIR_LIB_DIR}:${LD_LIBRARY_PATH}
+LD_LIBRARY_PATH:=${CURDIR}:${FLINT_MPFR_LIB_DIR}:${FLINT_MPIR_LIB_DIR}:${FLINT_NTL_LIB_DIR}:${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 export
 
@@ -69,20 +69,29 @@ endif
 
 library: library-recursive $(OBJS) $(LIB_OBJS)
 	mkdir -p build
-ifdef FLINT_SHARED
-	$(CC) -fPIC -shared $(LIB_OBJS) $(LIBS2) -o $(FLINT_LIB) 
-endif
-ifdef FLINT_STATIC
-	$(AR) rcs libflint.a $(OBJS) $(LINKLIBS)
-endif
+	mkdir -p build/iterfaces
+	if [ "$(WANT_NTL)" -eq "1" ]; then \
+		if [ "$(FLINT_SHARED)" -eq "1" ]; then \
+			$(CXX) -fPIC  $(CFLAGS) $(INCS) -c interfaces/NTL-interface.cpp -o build/interfaces/NTL-interface.lo; \
+		fi; \
+		if [ "$(FLINT_STATIC)" -eq "1" ]; then \
+                	$(CXX) -fPIC  $(CFLAGS) $(INCS) -c interfaces/NTL-interface.cpp -o build/interfaces/NTL-interface.o; \
+		fi; \
+	fi
+	if [ "$(FLINT_SHARED)" -eq "1" ]; then \
+        	$(CC) -fPIC -shared $(LIB_OBJS) $(LIBS2) -o $(FLINT_LIB); \
+	fi
+	if [ "$(FLINT_STATIC)" -eq "1" ]; then \
+        	$(AR) rcs libflint.a $(OBJS) $(LINKLIBS); \
+	fi
 
 library-recursive:
-ifdef FLINT_STATIC
-	$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); export BUILD_DIR=../build/$(dir); $(MAKE) -C $(dir);)
-endif
-ifdef FLINT_SHARED
-	$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); export BUILD_DIR=../build/$(dir); $(MAKE) -C $(dir) library;) 
-endif
+	if [ "$(FLINT_STATIC)" -eq "1" ]; then \
+		$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); export BUILD_DIR=../build/$(dir); $(MAKE) -C $(dir);) \
+	fi
+	if [ "$(FLINT_SHARED)" -eq "1" ]; then \
+		$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); export BUILD_DIR=../build/$(dir); $(MAKE) -C $(dir) library;) \
+	fi
 
 $(FLINT_LIB): library
 

configure

@@ -6,6 +6,8 @@
 PREFIX="/usr/local"
 MPIR_DIR="/usr"
 MPFR_DIR="/usr"
+NTL_DIR="/usr"
+WANT_NTL=0
 SHARED=1
 STATIC=1
 
@@ -17,6 +19,7 @@ usage()
    echo "   where <args> may be:"
    echo "     --with-mpir=<path> Specify location of MPIR"
    echo "     --with-mpfr=<path> Specify location of MPFR"
+   echo "     --with-ntl=<path>  Specify location of NTL and build NTL interface"
    echo "     --prefix=<path>    Specify path to installation location"
    echo "     --disable-shared   Do not build a shared library"
    echo "     --disable-static   Do not build a static library"
@@ -36,6 +39,10 @@ until [ -z "$1" ]; do
       "--with-mpfr="*)
          MPFR_DIR=`expr substr "$1" 13 length "$1"`
          ;;
+      "--with-ntl="*)
+         NTL_DIR=`expr substr "$1" 12 length "$1"`
+	 WANT_NTL=1
+         ;;
       "--prefix="*)
          PREFIX=`expr substr "$1" 10 length "$1"`
 	 ;;
@@ -83,6 +90,14 @@ else
    exit 1
 fi
 
+if [ -d "${NTL_DIR}/lib" ]; then
+   NTL_LIB_DIR="${NTL_DIR}/lib"
+   NTL_INCLUDE_DIR="${NTL_DIR}/include"
+else
+   echo "Invalid NTL directory"
+   exit 1
+fi
+
 if [ "`uname`" = "Linux" -a "`uname -m`" = "x86_64" ]; then
    FLINT_TUNE="-funroll-loops "
 elif [ "`uname`" = "Darwin" -a "`uname -m`" = "Power Macintosh" ]; then
@@ -111,23 +126,35 @@ if [ -z "$CC" ]; then
    CC=gcc
 fi
 
+if [ -z "$CXX" ]; then
+   CXX=g++
+fi
+
 CFLAGS="$CFLAGS $FLINT_TUNE"
 
 echo "# This file is autogenerated by ./configure -- do not edit!" > Makefile
 echo "" >> Makefile
-if [ "$STATIC" = "1" ]; then
+if [ "$STATIC" -eq "1" ]; then
     echo "FLINT_STATIC=1" >> Makefile
 fi
-if [ "$SHARED" = "1" ]; then
+if [ "$SHARED" -eq "1" ]; then
     echo "FLINT_SHARED=1" >> Makefile
 fi
+if [ "$WANT_NTL" -eq "1" ]; then
+    echo "WANT_NTL=1" >> Makefile
+    echo "OBJ_EXTRAS="build/interfaces/NTL-interface.o" >> Makefile
+    echo "LIB_EXTRAS="build/interfaces/NTL-interface.lo" >> Makefile
+fi
 echo "FLINT_MPIR_LIB_DIR=$MPIR_LIB_DIR" >> Makefile
 echo "FLINT_MPIR_INCLUDE_DIR=$MPIR_INCLUDE_DIR" >> Makefile
 echo "FLINT_MPFR_LIB_DIR=$MPFR_LIB_DIR" >> Makefile
 echo "FLINT_MPFR_INCLUDE_DIR=$MPFR_INCLUDE_DIR" >> Makefile
+echo "FLINT_NTL_LIB_DIR=$NTL_LIB_DIR" >> Makefile
+echo "FLINT_NTL_INCLUDE_DIR=$NTL_INCLUDE_DIR" >> Makefile
 echo "" >> Makefile
 echo "FLINT_LIB=$FLINT_LIB" >> Makefile
 echo "CC=$CC" >> Makefile
+echo "CXX=$CXX" >> Makefile
 echo "CFLAGS=$CFLAGS" >> Makefile
 echo "PREFIX=$PREFIX" >> Makefile
 echo "" >> Makefile