comparison configure.in @ 99:b7f456946c5b

add configure option --enable-dii=no to remove dependency on libgd. many fixes in pst2ldif by Robert Harris.
author Carl Byington <carl@five-ten-sg.com>
date Sun, 28 Sep 2008 17:08:52 -0700
parents 2e3ec9511166
children 1e4a7610d525
comparison
equal deleted inserted replaced
98:e12db0edd80a 99:b7f456946c5b
1 AC_PREREQ(2.59) 1 AC_PREREQ(2.59)
2 AC_INIT(libpst,0.6.19,carl@five-ten-sg.com) 2 AC_INIT(libpst,0.6.20,carl@five-ten-sg.com)
3 AC_CONFIG_SRCDIR([config.h.in]) 3 AC_CONFIG_SRCDIR([config.h.in])
4 AC_CONFIG_HEADER([config.h]) 4 AC_CONFIG_HEADER([config.h])
5 5
6 AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) 6 AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
7
7 8
8 # Checks for programs. 9 # Checks for programs.
9 my_build_dii=yes 10 my_build_dii=yes
10 AC_PATH_PROG(CONVERT, convert) 11 AC_PATH_PROG(CONVERT, convert)
11 if test "x$CONVERT" = "x" ; then 12 if test "x$CONVERT" = "x" ; then
12 AC_MSG_WARN([convert not found. pst2dii disabled]) 13 AC_MSG_WARN([convert not found. pst2dii disabled])
13 my_build_dii=no 14 my_build_dii=no
15 else
16 # The following lines adds the --enable-dii option to configure:
17 #
18 # Give the user the choice to enter one of these:
19 # --enable-dii
20 # --enable-dii=yes
21 # --enable-dii=no
22 #
23 AC_MSG_CHECKING([whether we are enabling dii utility])
24 AC_ARG_ENABLE(dii,
25 AC_HELP_STRING([--enable-dii], [enable dii utility]),
26 [if test "${enable_dii}" = "no" ; then
27 AC_MSG_RESULT([no])
28 my_build_dii=no
29 else
30 AC_MSG_RESULT([yes])
31 fi],
32 # Default value for configure
33 AC_MSG_RESULT([yes])
34 )
14 fi 35 fi
15 AM_CONDITIONAL(BUILD_DII, test $my_build_dii = yes) 36 AM_CONDITIONAL(BUILD_DII, test $my_build_dii = yes)
37
16 38
17 # Checks for programs. 39 # Checks for programs.
18 AC_PROG_CXX 40 AC_PROG_CXX
19 AC_PROG_CC 41 AC_PROG_CC
20 AC_PROG_CPP 42 AC_PROG_CPP
56 AC_FUNC_STRFTIME 78 AC_FUNC_STRFTIME
57 AC_FUNC_VPRINTF 79 AC_FUNC_VPRINTF
58 AC_CHECK_FUNCS([memchr memmove memset strcasecmp strchr strdup strerror strpbrk strrchr strstr strtol]) 80 AC_CHECK_FUNCS([memchr memmove memset strcasecmp strchr strdup strerror strpbrk strrchr strstr strtol])
59 81
60 # iconv on mac is a library 82 # iconv on mac is a library
83 SAVELIBS="${LIBS}"
61 AC_SEARCH_LIBS([iconv_open], [iconv]) 84 AC_SEARCH_LIBS([iconv_open], [iconv])
85 if test "x${SAVELIBS}" != "x${LIBS}"; then
86 all_libraries="/usr/lib $all_libraries"
87 AC_SUBST(all_libraries)
88 fi
62 89
63 # The following lines adds the --enable-pst-debug option to configure: 90 # The following lines adds the --enable-pst-debug option to configure:
64 # 91 #
65 # Give the user the choice to enter one of these: 92 # Give the user the choice to enter one of these:
66 # --enable-pst-debug 93 # --enable-pst-debug