diff options
| author | Matěj Týč <bubla@users.sourceforge.net> | 2009-04-05 19:25:08 +0000 |
|---|---|---|
| committer | Matěj Týč <bubla@users.sourceforge.net> | 2009-04-05 19:25:08 +0000 |
| commit | 0b6ad035ed3d88254ff06bb98ad4f73af06c7aa3 (patch) | |
| tree | 5eeb745aec61846e257b069277b260b744c5437f | |
| parent | 54ce1c60dff37e06fc2c27c09f10e251a19697ec (diff) | |
| download | devil-0b6ad035ed3d88254ff06bb98ad4f73af06c7aa3.tar.gz | |
small fixes of build system
| -rw-r--r-- | DevIL/ChangeLog | 4 | ||||
| -rw-r--r-- | DevIL/configure.ac | 3 | ||||
| -rw-r--r-- | DevIL/m4/devil-definitions.m4 | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/DevIL/ChangeLog b/DevIL/ChangeLog index fd4bf343..5c4f7a0e 100644 --- a/DevIL/ChangeLog +++ b/DevIL/ChangeLog @@ -1,3 +1,7 @@ +2009-03- Matěj Týč <bubla@users.sf.net> + * configure.ac: Corrected example compilation report + * m4/devil-definitions.m4: Added correct LCMS absence correct handling + 2009-03-16 Denton Woods <doomwiz@users.sf.net> * ilu_error-italian.h: Added Italian translation of error messages. * ilu_error.c: Added Italian support. diff --git a/DevIL/configure.ac b/DevIL/configure.ac index dacd897e..c427aa78 100644 --- a/DevIL/configure.ac +++ b/DevIL/configure.ac @@ -351,6 +351,9 @@ dnl The AM_COND_IF seems to be too new at the moment, let's wait a little bit ti dnl dnl AM_COND_IF([BUILD_ILU], +AS_IF([test "x$enable_ILU" != "xyes"], + [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD IL_override IL_read IL_simple"]) + AS_IF([test "x$enable_ILU" = "xyes"], [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILU_override ILU_read ILU_simple"]) diff --git a/DevIL/m4/devil-definitions.m4 b/DevIL/m4/devil-definitions.m4 index 7616e82b..a4efd2af 100644 --- a/DevIL/m4/devil-definitions.m4 +++ b/DevIL/m4/devil-definitions.m4 @@ -114,7 +114,7 @@ AC_DEFUN([TEST_FORMAT], [AC_MSG_RESULT([no]) AC_DEFINE([IL_NO_$2], [], - [$1 support ($3)])], + [$1 support ($3) ]) ], [AC_MSG_RESULT([yes]) SUPPORTED_FORMATS="$SUPPORTED_FORMATS $2"]) lib_test_result="" ]) @@ -137,8 +137,9 @@ dnl dnl Check for libraries dnl dnl Usage: -dnl DEVIL_IL_LIB(<include>, <library>) +dnl DEVIL_IL_LIB(<include>, <library>[, <define>]) dnl the <library> is appended to IL_LIBS, sets have_<library> to yes/no +dnl dnl If we don't detect the LIB, optionally #define IL_NO_<define> dnl Nothing else is done, see MAYBE_OPTIONAL_DEPENDENCY macro... dnl AC_DEFUN([DEVIL_IL_LIB], @@ -149,6 +150,10 @@ AC_DEFUN([DEVIL_IL_LIB], have_$2="yes"], [have_$2="no"])], [have_$2="no"]) ]) +dnl AS_IF([test $# = 3 -a "x$have_$2" = "xno"], +dnl [AC_DEFINE([IL_NO_$3], +dnl [], +dnl [$2 support ]) ]) ]) dnl dnl Checks for squish library = GPU accelerated DXT compression @@ -198,7 +203,10 @@ AS_IF([test "x$have_lcms_lib" = "xyes" -a "x$have_lcms_h" = "xyes"], [have_lcms="yes" IL_LIBS_REQUIRED="$IL_LIBS_REQUIRED lcms" lib_test_result="yes"], - [lib_test_result="no"]) ]) + [lib_test_result="no" + AC_DEFINE([IL_NO_LCMS], + [1], + [We don't have LCMS]) ]) ]) AC_DEFUN([SETTLE_OPENEXR], [PKG_CHECK_MODULES([OPENEXR], |