diff options
| author | TingPing <tingping@tingping.se> | 2014-06-01 15:47:09 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-06-02 05:38:13 -0400 |
| commit | 8578a9d52d993f4425259462c01854ea7784c57f (patch) | |
| tree | 52392a990c432049cc96537633c3daa209ea7f00 /configure.ac | |
| parent | 0b492d32b3b55b60896f6d278ced06a235396a64 (diff) | |
Always use GModule for plugin support
Also cleans up some dead code
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 0e4d1922..fdcf4fb9 100644 --- a/configure.ac +++ b/configure.ac @@ -185,9 +185,10 @@ fi PKG_CHECK_MODULES([GOBJECT], [gobject-2.0], [], [AC_MSG_ERROR(Cannot find gobject-2.0!)]) PKG_CHECK_MODULES([GIO], [gio-2.0], [], [AC_MSG_ERROR(Cannot find gio-2.0!)]) +PKG_CHECK_MODULES([GMODULE], [gmodule-2.0], [], [AC_MSG_ERROR(Cannot find gmodule-2.0!)]) -COMMON_CFLAGS="$GLIB_CFLAGS $GIO_CFLAGS $GOBJECT_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -COMMON_LIBS="$GLIB_LIBS $GIO_LIBS $GOBJECT_LIBS -lgmodule-2.0" +COMMON_CFLAGS="$GLIB_CFLAGS $GIO_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" +COMMON_LIBS="$GLIB_LIBS $GIO_LIBS $GOBJECT_LIBS $GMODULE_LIBS" dnl ********************************************************************* dnl ** GTK ************************************************************** @@ -426,29 +427,7 @@ dnl ** PLUGIN *********************************************************** dnl ********************************************************************* if test "$plugin" = yes; then - AC_CHECK_FUNCS(dlopen, have_dl=yes) - if test "$have_dl" != yes; then - AC_CHECK_LIB(dl, dlopen, have_dl=yes) - if test "$have_dl" = yes; then - LIBS="$LIBS -ldl" - fi - fi - if test "$have_dl" = yes; then - AC_DEFINE(USE_PLUGIN) - dnl we just need the -Wl,--export-dynamic, but not -lgmodule-2.0 - RDYNAMIC_FLAGS="`$PKG_CONFIG gmodule-2.0 --libs | $sedpath 's/ -lgmodule-2.0//'`" - LIBS="$LIBS $RDYNAMIC_FLAGS" - if test "$LD" = ""; then - VS="`ld --help | grep version-script 2> /dev/null`" - else - VS="`$LD --help | grep version-script 2> /dev/null`" - fi - if test "$VS" != ""; then - GUI_LIBS="$GUI_LIBS -Wl,--version-script,\$(srcdir)/../version-script" - fi - else - plugin=no - fi + AC_DEFINE(USE_PLUGIN) fi dnl ********************************************************************* |