X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=3213de0de756f90c12a0655db39f8f255ce770a3;hb=de51a9bc4da5dd3f1f9f57c2362da6f9752c44e0;hp=36be86004cabcace1a152103a7a056a158771c22;hpb=addd6871b4f5049cc0cd8654d921717d1949633c;p=platform%2Fupstream%2Fisl.git

diff --git a/configure.ac b/configure.ac
index 36be860..3213de0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,22 @@
-AC_INIT([isl], [0.08], [isl-development@googlegroups.com])
+AC_INIT([isl], [0.11.2], [isl-development@googlegroups.com])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_SUBST(versioninfo)
-versioninfo=8:0:0
+versioninfo=11:2:1
+
+if test "x$prefix" != "xNONE"; then
+	prefix_wd=`cd $prefix && pwd`
+	srcdir_wd=`cd $srcdir && pwd`
+	wd=`pwd`
+	if test "x$prefix_wd" = "x$srcdir_wd"; then
+		AC_MSG_ERROR(Installation in source directory not supported)
+	fi
+	if test "x$prefix_wd" = "x$wd"; then
+		AC_MSG_ERROR(Installation in build directory not supported)
+	fi
+fi
 
 AC_PROG_CC
 AC_PROG_CXX
@@ -23,15 +35,25 @@ AM_CONDITIONAL(GENERATE_DOC, test -n "$PERL" -a -n "$PDFLATEX" -a -n "$POD2HTML"
 
 AX_CREATE_STDINT_H(include/isl/stdint.h)
 
-AX_SUBMODULE(gmp,system,system)
+AX_SUBMODULE(gmp,system|build,system)
 
 AC_SUBST(GMP_CPPFLAGS)
 AC_SUBST(GMP_LDFLAGS)
-if test "x$with_gmp_prefix" != "x"; then
-	isl_configure_args="$isl_configure_args --with-gmp=$with_gmp_prefix"
-	GMP_CPPFLAGS="-I$with_gmp_prefix/include"
-	GMP_LDFLAGS="-L$with_gmp_prefix/lib"
-fi
+AC_SUBST(GMP_LIBS)
+case "$with_gmp" in
+system)
+	if test "x$with_gmp_prefix" != "x"; then
+		isl_configure_args="$isl_configure_args --with-gmp=$with_gmp_prefix"
+		GMP_CPPFLAGS="-I$with_gmp_prefix/include"
+		GMP_LDFLAGS="-L$with_gmp_prefix/lib"
+	fi
+	GMP_LIBS=-lgmp
+	;;
+build)
+	GMP_CPPFLAGS="-I$gmp_srcdir -I$with_gmp_builddir"
+	GMP_LIBS="$with_gmp_builddir/libgmp.la"
+	;;
+esac
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$GMP_CPPFLAGS $CPPFLAGS"
 need_get_memory_functions=false
@@ -103,7 +125,8 @@ system)
 	fi
 	CLANG_CXXFLAGS=`$llvm_config --cxxflags`
 	CLANG_LDFLAGS=`$llvm_config --ldflags`
-	CLANG_LIBS=`$llvm_config --libs`
+	targets=`$llvm_config --targets-built`
+	CLANG_LIBS=`$llvm_config --libs $targets asmparser bitreader support mc`
 	CLANG_PREFIX=`$llvm_config --prefix`
 	AC_DEFINE_UNQUOTED(CLANG_PREFIX, ["$CLANG_PREFIX"],
 				[Clang installation prefix])
@@ -113,6 +136,9 @@ system)
 	AC_LANG_PUSH(C++)
 	AC_CHECK_HEADER([clang/Basic/SourceLocation.h], [],
 		[AC_ERROR([clang header file not found])])
+	AC_EGREP_HEADER([getDefaultTargetTriple], [llvm/Support/Host.h], [],
+		[AC_DEFINE([getDefaultTargetTriple], [getHostTriple],
+		[Define to getHostTriple for older versions of clang])])
 	AC_EGREP_HEADER([getExpansionLineNumber],
 		[clang/Basic/SourceLocation.h], [],
 		[AC_DEFINE([getExpansionLineNumber],
@@ -123,8 +149,55 @@ system)
 		[AC_DEFINE([DiagnosticsEngine],
 			[Diagnostic],
 	    [Define to Diagnostic for older versions of clang])])
+	AC_EGREP_HEADER([ArrayRef], [clang/Driver/Driver.h],
+		[AC_DEFINE([USE_ARRAYREF], [],
+			[Define if Driver::BuildCompilation takes ArrayRef])])
+	AC_EGREP_HEADER([CXXIsProduction], [clang/Driver/Driver.h],
+		[AC_DEFINE([HAVE_CXXISPRODUCTION], [],
+		[Define if Driver constructor takes CXXIsProduction argument])])
+	AC_EGREP_HEADER([ IsProduction], [clang/Driver/Driver.h],
+		[AC_DEFINE([HAVE_ISPRODUCTION], [],
+		[Define if Driver constructor takes IsProduction argument])])
+	AC_EGREP_HEADER([void HandleTopLevelDecl\(], [clang/AST/ASTConsumer.h],
+		[AC_DEFINE([HandleTopLevelDeclReturn], [void],
+			   [Return type of HandleTopLevelDeclReturn])
+		 AC_DEFINE([HandleTopLevelDeclContinue], [],
+			   [Return type of HandleTopLevelDeclReturn])],
+		[AC_DEFINE([HandleTopLevelDeclReturn], [bool],
+			   [Return type of HandleTopLevelDeclReturn])
+		 AC_DEFINE([HandleTopLevelDeclContinue], [true],
+			   [Return type of HandleTopLevelDeclReturn])])
+	AC_CHECK_HEADER([clang/Basic/DiagnosticOptions.h],
+		[AC_DEFINE([HAVE_BASIC_DIAGNOSTICOPTIONS_H], [],
+			   [Define if clang/Basic/DiagnosticOptions.h exists])])
+	AC_TRY_COMPILE([#include <clang/Basic/TargetInfo.h>], [
+		using namespace clang;
+		TargetOptions *TO;
+		DiagnosticsEngine *Diags;
+		TargetInfo::CreateTargetInfo(*Diags, TO);
+	], [AC_DEFINE([CREATETARGETINFO_TAKES_POINTER], [],
+		      [Define if TargetInfo::CreateTargetInfo takes pointer])])
+	AC_TRY_COMPILE([#include <clang/Frontend/CompilerInstance.h>], [
+		using namespace clang;
+		DiagnosticConsumer *client;
+		CompilerInstance *Clang;
+		Clang->createDiagnostics(client);
+	], [], [AC_DEFINE([CREATEDIAGNOSTICS_TAKES_ARG], [],
+	[Define if CompilerInstance::createDiagnostics takes argc and argv])])
+	AC_TRY_COMPILE([#include <clang/Lex/HeaderSearchOptions.h>], [
+		using namespace clang;
+		HeaderSearchOptions HSO;
+		HSO.AddPath("", frontend::Angled, false, false);
+	], [AC_DEFINE([ADDPATH_TAKES_4_ARGUMENTS], [],
+		[Define if HeaderSearchOptions::AddPath takes 4 arguments])])
 	AC_LANG_POP
 	CPPFLAGS="$SAVE_CPPFLAGS"
+
+	SAVE_LDFLAGS="$LDFLAGS"
+	LDFLAGS="$CLANG_LDFLAGS $LDFLAGS"
+	AC_SUBST(LIB_CLANG_EDIT)
+	AC_CHECK_LIB([clangEdit], [main], [LIB_CLANG_EDIT=-lclangEdit], [])
+	LDFLAGS="$SAVE_LDFLAGS"
 	;;
 esac
 AM_CONDITIONAL(HAVE_CLANG, test $with_clang = system)
@@ -146,8 +219,11 @@ AC_CONFIG_HEADERS(isl_config.h)
 AC_CONFIG_HEADERS(include/isl/config.h)
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(doc/Makefile)
-AC_CONFIG_FILES(interface/Makefile)
+if test $with_clang = system; then
+	AC_CONFIG_FILES(interface/Makefile)
+fi
 AC_CONFIG_FILES([bound_test.sh], [chmod +x bound_test.sh])
+AC_CONFIG_FILES([codegen_test.sh], [chmod +x codegen_test.sh])
 AC_CONFIG_FILES([pip_test.sh], [chmod +x pip_test.sh])
 AC_CONFIG_COMMANDS_POST([
 	dnl pass on arguments to subdir configures, but don't