Skip to content

Commit 9025e94

Browse files
committed
Plugins: configure.ac: Be more helpful in absence of autoconf-archive and/or pkg.m4
Suggested-by: Eli Schwartz <[email protected]>
1 parent 4900c24 commit 9025e94

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

libvisual-plugins/configure.ac

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ fi
3232

3333
dnl Check for libvisual here so that users get told they have the
3434
dnl wrong dependencies as early in the process as possible.
35+
m4_pattern_forbid([^PKG_CHECK_MODULES$])
3536
PKG_CHECK_MODULES([LIBVISUAL], [libvisual_pkg >= libvisual_required_version],
3637
[],
3738
[AC_MSG_ERROR([*** libvisual libvisual_required_version not found.
@@ -46,6 +47,7 @@ AC_PROG_CXX
4647
dnl Check for typedefs, structures, and compiler characteristics.
4748
AC_C_CONST
4849
AC_C_INLINE
50+
m4_pattern_forbid([^AX_CXX_COMPILE_STDCXX_11$])
4951
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
5052

5153
dnl 'Standard' header files.
@@ -100,6 +102,7 @@ AC_ARG_ENABLE([pulseaudio], AS_HELP_STRING([--disable-pulseaudio],
100102
[ENABLE_INPUT_PULSEAUDIO=$enableval],
101103
[ENABLE_INPUT_PULSEAUDIO=yes])
102104
if test "$ENABLE_INPUT_PULSEAUDIO" = "yes"; then
105+
m4_pattern_forbid([^PKG_CHECK_MODULES$])
103106
PKG_CHECK_MODULES([LIBPULSE], [libpulse], [HAVE_LIBPULSE="yes"], [HAVE_LIBPULSE="no"])
104107
if test "$HAVE_LIBPULSE" = "yes"; then
105108
build_input_plugins="$build_input_plugins pulseaudio"
@@ -116,6 +119,7 @@ AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack],
116119
[ENABLE_INPUT_JACK=yes])
117120

118121
if test "$ENABLE_INPUT_JACK" = "yes"; then
122+
m4_pattern_forbid([^PKG_CHECK_MODULES$])
119123
PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"])
120124
if test "$HAVE_JACK" = "yes"; then
121125
build_input_plugins="$build_input_plugins jack"
@@ -131,6 +135,7 @@ AC_ARG_ENABLE([portaudio], AS_HELP_STRING([--disable-portaudio],
131135
[ENABLE_INPUT_PORTAUDIO=$enableval],
132136
[ENABLE_INPUT_PORTAUDIO=yes])
133137
AS_IF([test "$ENABLE_INPUT_PORTAUDIO" = yes], [
138+
m4_pattern_forbid([^PKG_CHECK_MODULES$])
134139
PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0], [HAVE_PORTAUDIO="yes"], [HAVE_PORTAUDIO="no"])
135140
AS_IF([test "$HAVE_PORTAUDIO" = yes], [
136141
build_input_plugins="$build_input_plugins portaudio"
@@ -148,6 +153,7 @@ AC_ARG_ENABLE([gdkpixbuf-plugin],
148153
[ENABLE_PLUGIN_GDKPIXBUF=yes])
149154

150155
if test "$ENABLE_PLUGIN_GDKPIXBUF" = "yes"; then
156+
m4_pattern_forbid([^PKG_CHECK_MODULES$])
151157
PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= gtk_required_version],
152158
[HAVE_GTK="yes"], [HAVE_GTK="no"])
153159

@@ -169,6 +175,7 @@ AC_ARG_ENABLE([gstreamer-plugin],
169175
[ENABLE_GSTREAMER_PLUGIN=yes])
170176

171177
if test "$ENABLE_GSTREAMER_PLUGIN" = "yes"; then
178+
m4_pattern_forbid([^PKG_CHECK_MODULES$])
172179
PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0 >= gst_required_version],
173180
[HAVE_GSTREAMER="yes"], [HAVE_GSTREAMER="no"])
174181

@@ -189,7 +196,9 @@ AC_ARG_ENABLE([opengl],
189196
[ENABLE_OPENGL_ACTORS=yes])
190197

191198
AS_IF([test "$ENABLE_OPENGL_ACTORS" = "yes"], [
199+
m4_pattern_forbid([^AX_CHECK_GL$])
192200
AX_CHECK_GL([HAVE_OPENGL="yes"], [HAVE_OPENGL="no"])
201+
m4_pattern_forbid([^AX_CHECK_GLU$])
193202
AX_CHECK_GLU([HAVE_GLU="yes"], [HAVE_GLU="no"; HAVE_OPENGL="no"])
194203
AS_IF([test "$HAVE_OPENGL" != "yes"], [
195204
AC_MSG_WARN([*** OpenGL and/or GLU have not been found, see above.

0 commit comments

Comments
 (0)