diff options
| author | Thomas White <taw@physics.org> | 2010-03-04 11:10:32 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2010-03-04 11:10:32 +0100 |
| commit | d59b05e531051524e079bf4e103e9abecc46bdaa (patch) | |
| tree | 18b6288395bae38020b994f6a15579ef75dfe4bb /configure.ac | |
| parent | a624cfc05b39b7671603d276a21b31974bf9dd56 (diff) | |
Configure script improvements
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1911f67d..95aebd31 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S + AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h]) AC_C_CONST @@ -18,12 +19,14 @@ AC_FUNC_MALLOC AC_TYPE_SIGNAL AC_CHECK_FUNCS([strdup]) + AC_ARG_WITH(hdf5, [AS_HELP_STRING([--with-hdf5], [specify location of HDF5 library])], [HDF5_CFLAGS="-I$withval/include" HDF5_LIBS="-L$withval/lib -lhdf5"], [HDF5_LIBS="-lhdf5"]) + AC_ARG_WITH(gsl, [AS_HELP_STRING([--with-gsl], [specify location of GSL])], [GSL_CFLAGS="-I$withval/include" @@ -51,6 +54,7 @@ AS_IF([test "x$enable_opencl" == "xyes"], [ AC_MSG_RESULT([no]) ]) +AM_CONDITIONAL([HAVE_OPENCL], test x$have_opencl = xtrue) AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [Disable GTK+/GLib])) @@ -71,9 +75,16 @@ AS_IF([test "x$enable_gtk" != "xno"], [ AC_MSG_RESULT([no]) ]) - AM_CONDITIONAL([HAVE_GTK], test x$havegtk = xtrue) -AM_CONDITIONAL([HAVE_OPENCL], test x$have_opencl = xtrue) + + +AC_CHECK_FUNCS(forkpty,, + AC_CHECK_LIB(util,forkpty, + [AC_DEFINE(HAVE_FORKPTY) LIBS="$LIBS -lutil"], + AC_CHECK_LIB(bsd,forkpty, [AC_DEFINE(HAVE_FORKPTY) LIBS="$LIBS -lbsd"]) + ) +) + CFLAGS="$CFLAGS $HDF5_CFLAGS $GTK_CFLAGS $GSL_CFLAGS $OPENCL_CFLAGS" LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -lutil" |