summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Friloux <guillaume@friloux.me>2014-06-12 14:53:22 +0200
committerGuillaume Friloux <guillaume@friloux.me>2014-06-12 14:53:22 +0200
commit87e29144f9e9db0f05c558b049c6ce083c9e1f2f (patch)
tree4c7d854de6fb45de76fe646b68f737af577bd5d5
parentd0d92275a612b5592d2c96bc4a00e05414488713 (diff)
Fix --disable-mysql and --disable-postgresqlHEADmaster
-rw-r--r--configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 678ab16..b5c74ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ AC_SUBST(requirement_esskyuehl)
60 60
61PKG_CHECK_MODULES([EFL], [$requirement_esskyuehl]) 61PKG_CHECK_MODULES([EFL], [$requirement_esskyuehl])
62 62
63MYSQL_LIBS=""
63AC_ARG_ENABLE([mysql], 64AC_ARG_ENABLE([mysql],
64 [AC_HELP_STRING([--disable-mysql], [disable mysql module @<:@default=detect@:>@])], 65 [AC_HELP_STRING([--disable-mysql], [disable mysql module @<:@default=detect@:>@])],
65 [ 66 [
@@ -97,6 +98,8 @@ if test "x${want_mysql}" != "xno" ; then
97 AC_SUBST(MYSQL_CFLAGS) 98 AC_SUBST(MYSQL_CFLAGS)
98 AC_SUBST(MYSQL_LIBS) 99 AC_SUBST(MYSQL_LIBS)
99fi 100fi
101AM_CONDITIONAL([MYSQL], [test -n "$MYSQL_LIBS"])
102AC_SUBST(MYSQL_LIBS)
100 103
101AC_ARG_ENABLE([postgresql], 104AC_ARG_ENABLE([postgresql],
102 [AC_HELP_STRING([--disable-postgresql], [disable postgresql module @<:@default=detect@:>@])], 105 [AC_HELP_STRING([--disable-postgresql], [disable postgresql module @<:@default=detect@:>@])],
@@ -109,6 +112,7 @@ AC_ARG_ENABLE([postgresql],
109 ], 112 ],
110 [want_postgresql="yes"]) 113 [want_postgresql="yes"])
111 114
115POSTGRESQL_LIBS=""
112if test "x${want_postgresql}" != "xno" ; then 116if test "x${want_postgresql}" != "xno" ; then
113 AC_MSG_CHECKING([for postgresql]) 117 AC_MSG_CHECKING([for postgresql])
114 AC_PATH_PROG([pg_config], [pg_config]) 118 AC_PATH_PROG([pg_config], [pg_config])
@@ -126,10 +130,10 @@ if test "x${want_postgresql}" != "xno" ; then
126 else 130 else
127 AC_MSG_RESULT([no]) 131 AC_MSG_RESULT([no])
128 fi 132 fi
129 AM_CONDITIONAL([POSTGRESQL], [test -n "$POSTGRESQL_LIBS"])
130 AC_SUBST(POSTGRESQL_CFLAGS) 133 AC_SUBST(POSTGRESQL_CFLAGS)
131 AC_SUBST(POSTGRESQL_LIBS)
132fi 134fi
135AM_CONDITIONAL([POSTGRESQL], [test -n "$POSTGRESQL_LIBS"])
136AC_SUBST(POSTGRESQL_LIBS)
133 137
134AC_ARG_ENABLE([sqlite], 138AC_ARG_ENABLE([sqlite],
135 [AC_HELP_STRING([--disable-sqlite], [disable sqlite module @<:@default=detect@:>@])], 139 [AC_HELP_STRING([--disable-sqlite], [disable sqlite module @<:@default=detect@:>@])],