Changeset 1208 for libcaca/trunk/configure.acTweet

Timestamp:

Oct 20, 2006, 12:43:17 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Added a --enable-plugins configure flag that builds the GL and X11 drivers as plugins. This way, libcaca does not directly depend on those libraries.

File:

• libcaca/trunk/configure.ac (modified) (7 diffs)

libcaca/trunk/configure.ac

@@ -63 +63 @@
 
 dnl conditional builds
+AC_ARG_ENABLE(plugins,
+  [  --enable-plugins        build X11 and GL drivers as plugins])
 AC_ARG_ENABLE(doc,
   [  --enable-doc            build documentation (needs doxygen and LaTeX)])
 
-AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h)
+AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h)
 AC_CHECK_FUNCS(signal ioctl vsnprintf getenv putenv strcasecmp htons)
 AC_CHECK_FUNCS(usleep gettimeofday)
@@ -157 +159 @@
     AC_DEFINE(USE_X11, 1, Define to 1 to activate the X11 backend driver)
     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
-    CACA_LIBS="${CACA_LIBS} -lX11 ${X_LIBS}"
+    X11_LIBS="${X11_LIBS} -lX11 ${X_LIBS}"
     CACA_DRIVERS="${CACA_DRIVERS} x11"],
    [ac_cv_my_have_x11="no"],
@@ -181 +183 @@
   if test "${ac_cv_my_have_gl}" = "yes"; then
     AC_DEFINE(USE_GL, 1, Define to 1 to activate the OpenGL backend driver)
-    CACA_LIBS="${CACA_LIBS} -lGL -lglut"
+    GL_LIBS="${GL_LIBS} -lGL -lglut"
     CACA_DRIVERS="${CACA_DRIVERS} gl"
   elif test "${enable_gl}" = "yes"; then
@@ -225 +227 @@
 AM_CONDITIONAL(USE_KERNEL, test "${ac_cv_my_have_vga}" = "yes")
 
+if test "${enable_plugins}" = "yes"; then
+  ac_cv_my_have_plugins="yes"
+  AC_DEFINE(USE_PLUGINS, 1, Define to 1 to activate plugins)
+  CACA_LIBS="${CACA_LIBS} -ldl"
+else
+  CACA_LIBS="${CACA_LIBS} ${X11_LIBS} ${GL_LIBS}"
+fi
+AM_CONDITIONAL(USE_PLUGINS, test "${ac_cv_my_have_plugins}" = "yes")
+
 AC_MSG_CHECKING(valid output drivers)
 if test -z "${CACA_DRIVERS}"; then
@@ -238 +249 @@
 AC_SUBST(GETOPT_LIBS)
 AC_SUBST(CACA_LIBS)
+AC_SUBST(X11_LIBS)
+AC_SUBST(GL_LIBS)
 
 # Optimizations
@@ -262 +275 @@
 if test "${enable_imlib2}" != "no"; then
   IMLIB2="no"
-  PKG_CHECK_MODULES(imlib2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
+  PKG_CHECK_MODULES(IMLIB2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
   if test "${IMLIB2}" = no; then
     AC_MSG_ERROR([[cannot find Imlib2 development files. Without Imlib2, cacaview will only open BMP files; if this is really what you want, re-run configure with '--disable-imlib2'.]])
@@ -270 +283 @@
 # Build development tools?
 PANGOFT2="no"
-PKG_CHECK_MODULES(pangoft2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
+PKG_CHECK_MODULES(PANGOFT2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
 AM_CONDITIONAL(USE_PANGO, test "${PANGOFT2}" != "no")