]>
Commit | Line | Data |
---|---|---|
dd108279 JB |
1 | --- dwi-0.6.2/configure.in.orig 2004-07-29 15:49:36.000000000 +0200 |
2 | +++ dwi-0.6.2/configure.in 2006-02-22 11:40:41.000000000 +0100 | |
3 | @@ -68,13 +68,16 @@ | |
4 | AC_SUBST(QOF_CFLAGS) | |
5 | AC_SUBST(QOF_LIBS) | |
6 | ||
7 | -if test x$QOF_LIBS = x; then | |
8 | +AC_ARG_WITH(qof, [ --without-qof disable qof support]) | |
9 | +if test "$with_qof" = "no"; then | |
10 | + QOF_LIBS= | |
11 | +elif test x"$QOF_LIBS" = x; then | |
12 | AC_MSG_WARN([****** QOF libs not found; build without QOF.]) | |
13 | else | |
c4f99e30 JB |
14 | AC_DEFINE(HAVE_QOF,,We Have Found QOF) |
15 | fi | |
16 | ||
17 | -AM_CONDITIONAL(BUILD_QOF, [test x$HAVE_QOF = x]) | |
dd108279 | 18 | +AM_CONDITIONAL(BUILD_QOF, [test x"$QOF_LIBS" != x]) |
c4f99e30 JB |
19 | |
20 | dnl ************************************************************** | |
21 | dnl If ODBC is found on the build system, then use it. | |
22 | --- dwi-0.6.1/examples/app-integration/Makefile.am.orig 2006-02-22 12:28:48.000000000 +0100 | |
23 | +++ dwi-0.6.1/examples/app-integration/Makefile.am 2006-02-22 12:34:36.000000000 +0100 | |
24 | @@ -38,7 +38,6 @@ | |
25 | ../../app/libdwi-parse.la \ | |
26 | ../../src/libdwi.la \ | |
27 | ../../dwi-gtk/libdwi-gtk.la \ | |
28 | - ../../dwi-qof/libdwi-qof.la \ | |
29 | ../../db_drivers/libdwi-dbdrivers.la | |
30 | ||
31 | # ---------------------------------------------- | |
32 | @@ -62,7 +61,6 @@ | |
33 | ../../app/libdwi-parse.la \ | |
34 | ../../src/libdwi.la \ | |
35 | ../../dwi-gtk/libdwi-gtk.la \ | |
36 | - ../../dwi-qof/libdwi-qof.la \ | |
37 | ../../db_drivers/libdwi-dbdrivers.la | |
38 | ||
39 | # ---------------------------------------------- | |
40 | --- dwi-0.6.1/examples/basic-qof/Makefile.am.orig 2006-02-22 12:28:48.000000000 +0100 | |
41 | +++ dwi-0.6.1/examples/basic-qof/Makefile.am 2006-02-22 12:34:58.000000000 +0100 | |
42 | @@ -9,7 +9,9 @@ | |
43 | # Created by Linas Vepstas March 2002 | |
44 | # | |
45 | ||
46 | +if BUILD_QOF | |
47 | noinst_PROGRAMS = my-app | |
48 | +endif | |
49 | ||
50 | EXTRA_DIST = \ | |
51 | .cvsignore \ | |
52 | --- dwi-0.6.1/examples/qof-proto/Makefile.am.orig 2006-02-22 12:28:48.000000000 +0100 | |
53 | +++ dwi-0.6.1/examples/qof-proto/Makefile.am 2006-02-22 12:35:24.000000000 +0100 | |
54 | @@ -9,7 +9,9 @@ | |
55 | # Created by Linas Vepstas March 2002 | |
56 | # | |
57 | ||
58 | +if BUILD_QOF | |
59 | noinst_PROGRAMS = my-app | |
60 | +endif | |
61 | ||
62 | EXTRA_DIST = \ | |
63 | .cvsignore \ |