X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=be4baf83cd83402a8270ed7b16c33dbc177d0b73;hb=55e2249eff198f8a496f6d31f5ebb5eaad83d141;hp=e084a75b37da7101f9d29904d6c96d4afc9f0934;hpb=21f70a2e26e7ea5466f56abd0087eea6eeda91fa;p=platform%2Fupstream%2Fisl.git

diff --git a/configure.ac b/configure.ac
index e084a75..be4baf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,26 @@
 AC_INIT
-AM_INIT_AUTOMAKE(isl, 0.00)
+AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE(isl, 0.04)
+AC_SUBST(versioninfo)
+versioninfo=4:0:0
 
 AC_PROG_CC
 
+AX_CC_MAXOPT
+AX_GCC_WARN_UNUSED_RESULT
+
 AC_PROG_LIBTOOL
 
+AC_CHECK_PROG(PERL, perl, perl, [])
+AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex, [])
+AC_CHECK_PROG(POD2HTML, pod2html, pod2html, [])
+
+AM_CONDITIONAL(GENERATE_DOC, test -n "$PERL" -a -n "$PDFLATEX" -a -n "$POD2HTML")
+
 AX_CREATE_STDINT_H(include/isl_stdint.h)
 
-AC_ARG_WITH(gmp_prefix,
-	[AS_HELP_STRING([--with-gmp-prefix=DIR],
-			[Location of GMP installation])])
+AX_SUBMODULE(gmp,system,system)
 
 AC_SUBST(GMP_CPPFLAGS)
 AC_SUBST(GMP_LDFLAGS)
@@ -27,125 +38,13 @@ AC_CHECK_DECLS(mp_get_memory_functions,[],[
 CPPFLAGS="$SAVE_CPPFLAGS"
 AM_CONDITIONAL(NEED_GET_MEMORY_FUNCTIONS, test x$need_get_memory_functions = xtrue)
 
-AC_DEFUN([ISL_SUBMODULE],[
-	AC_ARG_WITH($1_prefix,
-		[AS_HELP_STRING([--with-$1-prefix=DIR],
-				[Location of system $1])])
-	AC_ARG_WITH($1_builddir,
-		    [AS_HELP_STRING([--with-$1-builddir=DIR],
-				    [Location of $1 builddir])])
-	if test "x$with_$1_prefix" != "x"; then
-		if test "x$with_$1" != "x" -a "x$with_$1" != "xsystem"; then
-			AC_MSG_ERROR([Setting $with_$1_prefix implies use of system $1])
-		fi
-		with_$1="system"
-	fi
-	if test "x$with_$1_builddir" != "x"; then
-		if test "x$with_$1" != "x" -a "x$with_$1" != "xbuild"; then
-			AC_MSG_ERROR([Setting $with_$1_builddir implies use of build $1])
-		fi
-		with_$1="build"
-		$1_srcdir=`echo @abs_srcdir@ | $with_$1_builddir/config.status --file=-`
-		AC_MSG_NOTICE($1 sources in $$1_srcdir)
-	fi
-	case "$with_$1" in
-	no|bundled|system|build)
-		;;
-	*)
-		if test -d $srcdir/.git -a \
-			-d $srcdir/$1 -a \
-			! -d $srcdir/$1/.git; then
-			AC_MSG_WARN(
-[git repo detected, but submodule $1 not initialized])
-			AC_MSG_WARN([You may want to run])
-			AC_MSG_WARN([	git submodule init])
-			AC_MSG_WARN([	git submodule update])
-			AC_MSG_WARN([	sh autogen.sh])
-		fi
-		if test -f $srcdir/$1/configure; then
-			with_$1="bundled"
-		fi
-		;;
-	esac
-])
-
-AC_ARG_WITH(polylib,
-	[AS_HELP_STRING([--with-polylib=build|system|no],
-			[Which PolyLib to use])])
-ISL_SUBMODULE(polylib)
-if test "x$with_polylib" = "x"; then
-	with_polylib="no"
-fi
-AC_MSG_CHECKING([which polylib to use])
-AC_MSG_RESULT($with_polylib)
-
-have_polylib=false
-AC_SUBST(POLYLIB_CPPFLAGS)
-AC_SUBST(POLYLIB_LDFLAGS)
-AC_SUBST(POLYLIB_LIBS)
-case "$with_polylib" in
-	build)
-		polylibs=`echo @polylibs@ | $with_polylib_builddir/config.status --file=-`
-		AC_MSG_NOTICE(Configured polylibs: $polylibs)
-		isl_cv_polylib=missing
-		for bits in $polylibs; do
-			if test "$bits" = "libpolylibgmp.la"; then
-				isl_cv_polylib=ok
-			fi
-		done
-		if test "$isl_cv_polylib" = "missing"; then
-			AC_MSG_ERROR(no gmp polylib configured)
-		fi
-		POLYLIB_CPPFLAGS="-I$with_polylib_builddir/include -I$polylib_srcdir/include"
-		POLYLIB_LIBS="$with_polylib_builddir/libpolylibgmp.la"
-	;;
-	system)
-		POLYLIB_LIBS="-lpolylibgmp"
-		if test "x$with_polylib_prefix" != "x"; then
-			POLYLIB_CPPFLAGS="-I$with_polylib_prefix/include"
-			POLYLIB_LDFLAGS="-L$with_polylib_prefix/lib"
-		fi
-		SAVE_CPPFLAGS="$CPPFLAGS"
-		SAVE_LDFLAGS="$LDFLAGS"
-		CPPFLAGS="$POLYLIB_CPPFLAGS $CPPFLAGS"
-		LDFLAGS="$POLYLIB_LDFLAGS $LDFLAGS"
-		AC_CHECK_LIB(polylibgmp, PolyhedronTSort,[ true ],[
-			AC_MSG_ERROR(Need polylib)
-		])
-		CPPFLAGS="$SAVE_CPPFLAGS"
-		LDFLAGS="$SAVE_LDFLAGS"
-	;;
-	no)
-	;;
-	*)
-		AC_MSG_ERROR(unsupported)
-	;;
-esac
-if test "$with_polylib" != "no"; then
-	AC_DEFINE(ISL_POLYLIB,,polylib is available)
-	have_polylib=true
-fi
-AM_CONDITIONAL(HAVE_POLYLIB, test x$have_polylib = xtrue)
-
-AC_ARG_WITH(piplib,
-	[AS_HELP_STRING([--with-piplib=build|bundled|system|no],
-			[Which piplib to use])])
-ISL_SUBMODULE(piplib)
-if test "x$with_piplib" = "x"; then
-	with_piplib="system"
-fi
-AC_MSG_CHECKING([which piplib to use])
-AC_MSG_RESULT($with_piplib)
+AX_SUBMODULE(piplib,no|system|build,no)
 
 have_piplib=false
 AC_SUBST(PIPLIB_CPPFLAGS)
 AC_SUBST(PIPLIB_LDFLAGS)
 AC_SUBST(PIPLIB_LIBS)
 case "$with_piplib" in
-	bundled)
-		PIPLIB_CPPFLAGS="-I$srcdir/piplib/include"
-		isl_configure_args="$isl_configure_args --enable-mp-version"
-	;;
 	build)
 		PIPLIB_CPPFLAGS="-I$piplib_srcdir/include"
 		PIPLIB_LIBS="$with_piplib_builddir/libpiplibMP.la"
@@ -181,17 +80,20 @@ if test "$with_piplib" != "no"; then
 	have_piplib=true
 fi
 AM_CONDITIONAL(HAVE_PIPLIB, test x$have_piplib = xtrue)
-AM_CONDITIONAL(BUNDLED_PIPLIB, test $with_piplib = bundled)
+
+PACKAGE_CFLAGS="-I$prefix/include/isl"
+AX_CREATE_PKGCONFIG_INFO
+
+AX_DETECT_GIT_HEAD
+echo '#define GIT_HEAD_ID "'$GIT_HEAD_ID'"' > gitversion.h
 
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_HEADERS(include/isl_ctx.h)
+AC_CONFIG_HEADERS(include/isl_config.h)
 AC_CONFIG_FILES(Makefile)
-if test $with_piplib = bundled; then
-	AC_CONFIG_SUBDIRS(piplib)
-fi
+AC_CONFIG_FILES(doc/Makefile)
 AC_CONFIG_COMMANDS_POST([
 	dnl pass on arguments to subdir configures, but don't
-	ac_configure_args="$ac_configure_args $isl_configure_args"
+	dnl add them to config.status
 	ac_configure_args="$ac_configure_args $isl_configure_args"
 ])
 AC_OUTPUT