diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2007-11-20 21:52:54 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2007-11-20 21:52:54 +0000 |
| commit | 6208077d2ab95b14e507b6713daa6b162d097365 (patch) | |
| tree | 01ef564850991a5e38a49b667f5178e6c7a10bff | |
| parent | d76c1e8cd0da9699a51042db01ebd67e87b6f9e2 (diff) | |
Add configure summary.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | configure.in | 78 |
2 files changed, 78 insertions, 2 deletions
@@ -4,6 +4,8 @@ CHANGES IN FLTK 1.1.8 STR #1457, STR #1458, STR #1460, STR #1481, STR #1578, STR #1639, STR #1645, STR #1644, STR #1792, STR #1793, STR #1742, STR #1777) + - The configure script now shows a summry of the + configuration results (STR #1810) - "fltk-config --use-* --libs" did not list all of the dependent libraries (STR #1799) - Hiding a nested window on WIN32 caused 100% CPU (STR #1748) diff --git a/configure.in b/configure.in index 264017d8e..9d79a1c67 100644 --- a/configure.in +++ b/configure.in @@ -426,11 +426,11 @@ LARGEFILE="" if test x$enable_largefile = xyes; then LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" - if test $ac_cv_sys_large_files = 1; then + if test x$ac_cv_sys_large_files = x1; then LARGEFILE="$LARGEFILE -D_LARGE_FILES" fi - if test $ac_cv_sys_file_offset_bits = 64; then + if test x$ac_cv_sys_file_offset_bits = x64; then LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64" fi fi @@ -1069,6 +1069,80 @@ else AC_DEFINE_UNQUOTED(FLTK_DATADIR, "$prefix/share/fltk") fi +dnl Summarize results of configure tests... +echo "" +echo "Configuration Summary" +echo "-------------------------------------------------------------------------" + +case $uname in + CYGWIN* | MINGW*) + graphics="GDI" + ;; + Darwin*) + if test x$enable_quartz = xyes; then + graphics="Quartz" + else + graphics="Quickdraw" + fi + ;; + *) + graphics="X11" + if test x$enable_xft = xyes; then + graphics="$graphics+Xft" + fi + if test x$enable_xdbe = xyes; then + graphics="$graphics+Xdbe" + fi + if test x$enable_xinerama = xyes; then + graphics="$graphics+Xinerama" + fi + ;; +esac + +echo " Directories: prefix=$prefix" +echo " bindir=$bindir" +echo " datadir=$datadir" +echo " datarootdir=$datarootdir" +echo " exec_prefix=$exec_prefix" +echo " includedir=$includedir" +echo " libdir=$libdir" +echo " mandir=$mandir" +echo " Graphics: $graphics" + +if test x$JPEG = x; then + echo "Image Libraries: JPEG=System" +else + echo "Image Libraries: JPEG=Builtin" +fi +if test x$PNG = x; then + echo " PNG=System" +else + echo " PNG=Builtin" +fi +if test x$ZLIB = x; then + echo " ZLIB=System" +else + echo " ZLIB=Builtin" +fi + +if test x$enable_largefile = xyes; then + echo " Large Files: YES" +else + echo " Large Files: NO" +fi + +if test x$GLDEMOS = x; then + echo " OpenGL: NO" +else + echo " OpenGL: YES" +fi + +if test x$THREADS = x; then + echo " Threads: NO" +else + echo " Threads: YES" +fi + dnl Write all of the files... AC_CONFIG_HEADER(config.h:configh.in) AC_OUTPUT(makeinclude fltk.list fltk-config fltk.spec FL/Makefile) |
