Author: jasper Date: 2008-07-17 09:36:55 +0000 (Thu, 17 Jul 2008) New Revision: 27324
Modified: xfconf/trunk/configure.ac.in Log: DOS line-endings, eww. Modified: xfconf/trunk/configure.ac.in =================================================================== --- xfconf/trunk/configure.ac.in 2008-07-17 00:22:45 UTC (rev 27323) +++ xfconf/trunk/configure.ac.in 2008-07-17 09:36:55 UTC (rev 27324) @@ -1,229 +1,229 @@ -dnl configure.ac -dnl -dnl xfconf - dbus-based configuration daemon and library for xfce -dnl -dnl Copyright (c) 2007 Brian Tarricone <[EMAIL PROTECTED]> -dnl - -dnl version info -m4_define([libxfconf_verinfo], [0:0:0]) -m4_define([libxfconf_version_api], [0]) -m4_define([libxfconf_gtk_verinfo], [0:0:0]) -m4_define([libxfconf_gtk_version_api], [0]) -m4_define([xfconf_version_major], [0]) -m4_define([xfconf_version_minor], [1]) -m4_define([xfconf_version_micro], [0]) -m4_define([xfconf_version_build], [EMAIL PROTECTED]@]) -m4_define([xfconf_version_tag], [svn]) -m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_tag(), [svn], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) - -dnl init autoconf -AC_INIT([xfconf], [xfconf_version], [EMAIL PROTECTED]) -AC_PREREQ([2.50]) - -dnl init automake -AM_INIT_AUTOMAKE() -AM_CONFIG_HEADER([config.h]) -dnl AC_DEFINE([WEBSITE], ["http://spuriousinterrupt.org/projects/xfconf";], -dnl [Location of the xfconf website]) -AM_MAINTAINER_MODE - -dnl check for UNIX variants -AC_AIX -AC_ISC_POSIX -AC_MINIX - -dnl check for basic programs -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LIBTOOL -dnl AC_PROG_INTLTOOL([0.31], [no-xml]) -dnl AC_PROG_MAKE_SET -AC_CHECK_PROGS([PERL], [perl5 perl]) - -dnl check for standard header files -AC_HEADER_STDC -AC_CHECK_HEADERS([errno.h fcntl.h grp.h \ - signal.h stdlib.h string.h \ - sys/stat.h sys/time.h sys/types.h sys/wait.h \ - unistd.h]) -dnl AC_CHECK_FUNCS([fdwalk getdtablesize setsid sysconf]) - -dnl version information -XFCONF_VERSION=xfconf_version -LIBXFCONF_VERSION_API=libxfconf_version_api -LIBXFCONF_VERINFO=libxfconf_verinfo -LIBXFCONF_GTK_VERSION_API=libxfconf_gtk_version_api -LIBXFCONF_GTK_VERINFO=libxfconf_gtk_verinfo -AC_SUBST(XFCONF_VERSION) -AC_SUBST(LIBXFCONF_VERSION_API) -AC_SUBST(LIBXFCONF_VERINFO) -AC_SUBST(LIBXFCONF_GTK_VERSION_API) -AC_SUBST(LIBXFCONF_GTK_VERINFO) - -dnl Check for i18n support -XDT_I18N([EMAIL PROTECTED]@]) - -dnl Check for X11 installed -dnl XDT_CHECK_LIBX11_REQUIRE - -dnl required -XDT_CHECK_PACKAGE([GLIB], [gobject-2.0], [2.8.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) -dnl XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) -XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72]) - -dnl make xsettings daemon optional (so gtk dep is optional) -AC_ARG_ENABLE([xsettings-daemon], - [AC_HELP_STRING([--disable-xsettings-daemon], - [Don't build the XSETTINGS daemon (default=yes)])], - [build_xfsettingsd=$enableval], - [build_xfsettingsd=yes]) -AM_CONDITIONAL([BUILD_XFSETTINGSD], [test "x$build_xfsettingsd" = "xyes"]) - -dnl make xfconf-gtk lib optional (so gtk dep is optional) -AC_ARG_ENABLE([xfconf-gtk], - [AC_HELP_STRING([--disable-xfconf-gtk], - [Don't build xfconf-gtk convenience library (default=yes)])], - [build_xfconf_gtk=$enableval], - [build_xfconf_gtk=yes]) -AM_CONDITIONAL([BUILD_XFCONF_GTK], [test "x$build_xfconf_gtk" = "xyes"]) - -if test "x$build_xfsettingsd" = "xyes" -o "x$build_xfconf_gtk" = "xyes"; then - XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0]) -fi - -dnl ******************************** -dnl Check for XKB (xkb-settings) *** -dnl ******************************** -AC_ARG_ENABLE([xkb], -AC_HELP_STRING([--enable-xkb], [try to use the XKB extension]) -AC_HELP_STRING([--disable-xkb], [don't try to use the XKB extension]), - [], [enable_xkb=yes]) -XKB_LIBS= -if test x"$enable_xkb" = x"yes"; then - AC_CHECK_LIB(Xext, XkbLibraryVersion, - [XKB_LIBS="-lXi" - AC_DEFINE([HAVE_XKB], [1], [Define if XInput is present])], - [],[$LIBX11_LIBS -lXi]) -fi -AC_SUBST([XKB_LIBS]) - -dnl check alignment for struct returns -AC_DEFUN([BT_GLIB_CHECK_ALIGNOF], -[ - saved_CFLAGS="$CFLAGS" - saved_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_CHECK_ALIGNOF([$1], [#include <glib.h>]) - CFLAGS="$saved_CFLAGS" - LIBS="$saved_LIBS" -]) -BT_GLIB_CHECK_ALIGNOF(guchar) -BT_GLIB_CHECK_ALIGNOF(gchar) -BT_GLIB_CHECK_ALIGNOF(guint16) -BT_GLIB_CHECK_ALIGNOF(gint16) -BT_GLIB_CHECK_ALIGNOF(guint32) -BT_GLIB_CHECK_ALIGNOF(gint32) -BT_GLIB_CHECK_ALIGNOF(guint64) -BT_GLIB_CHECK_ALIGNOF(gint64) -BT_GLIB_CHECK_ALIGNOF(gfloat) -BT_GLIB_CHECK_ALIGNOF(gdouble) -BT_GLIB_CHECK_ALIGNOF(gboolean) -BT_GLIB_CHECK_ALIGNOF(gpointer) - -dnl gtk-doc -GTK_DOC_CHECK([1.0]) - -dnl backends - -dnl always build the perchannel-xml backend -xfconf_backend_perchannel_xml=yes -AM_CONDITIONAL([BUILD_XFCONF_BACKEND_PERCHANNEL_XML], - [test "x$xfconf_backend_perchannel_xml" = "xyes"]) -if test "x$xfconf_backend_perchannel_xml" = "xyes"; then - AC_DEFINE([BUILD_XFCONF_BACKEND_PERCHANNEL_XML], [1], - [Define if the perchannel-xml backend should be built]) -fi - -dnl check for debugging support -XDT_FEATURE_DEBUG -dnl if test "x$enable_debug" = "xfull"; then -dnl if test "x$CC" = "xgcc"; then -dnl CFLAGS="$CFLAGS -fno-strict-aliasing" -dnl fi -dnl fi - -AC_ARG_ENABLE([checks], - AC_HELP_STRING([--enable-checks], - [Enables some runtime checks for libxfconf that print debugging information at a slight cost to library code size and speed]), - [enable_checks=yes]) -if test "x$enable_checks" = "xyes"; then - AC_DEFINE([XFCONF_ENABLE_CHECKS], [1], - [Define if runtime checks should be performed]) -fi - -dnl check whether the compiler supports the visibility attribute -AC_ARG_ENABLE([visibility], - AC_HELP_STRING([--disable-visibility], - [Don't use ELF visibility attributes]), - [], [enable_visibility=yes]) -have_gnuc_visibility=no -if test "x$enable_visibility" != "xno"; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wall -Werror" - AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE( - [ - void __attribute__ ((visibility("default"))) test_default (void) {} - void __attribute__ ((visibility("hidden"))) test_hidden (void) {} - int main (int argc, char **argv) { test_default (); test_hidden (); return 0; } - ]), - [ - have_gnuc_visibility=yes - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - ]) - CFLAGS="$save_CFLAGS" -fi -if test "x$have_gnuc_visibility" = "xyes"; then - CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" -fi -AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"]) - -AC_ARG_ENABLE([profiling], - AC_HELP_STRING([--enable-profiling], - [Enable gprof profiling support]), - [enable_profiling=yes]) -if test "x$enable_profiling" = "xyes"; then - AC_DEFINE([XFCONF_ENABLE_PROFILING], [1], - [Define if gprof profiling should be compiled in]) -fi -AM_CONDITIONAL([ENABLE_PROFILING], [test "x$enable_profiling" = "xyes"]) - -AC_OUTPUT([ -Makefile -common/Makefile -docs/Makefile -docs/reference/Makefile -docs/reference/version.xml -docs/spec/Makefile -docs/xfsettingsd/Makefile -po/Makefile.in -tests/Makefile -tests/set-properties/Makefile -tests/has-properties/Makefile -tests/get-properties/Makefile -tests/remove-properties/Makefile -tests/property-changed-signal/Makefile -xfconf/Makefile -xfconf/libxfconf-0.pc -xfconf-query/Makefile -xfconfd/Makefile -xfsettingsd/Makefile -]) +dnl configure.ac +dnl +dnl xfconf - dbus-based configuration daemon and library for xfce +dnl +dnl Copyright (c) 2007 Brian Tarricone <[EMAIL PROTECTED]> +dnl + +dnl version info +m4_define([libxfconf_verinfo], [0:0:0]) +m4_define([libxfconf_version_api], [0]) +m4_define([libxfconf_gtk_verinfo], [0:0:0]) +m4_define([libxfconf_gtk_version_api], [0]) +m4_define([xfconf_version_major], [0]) +m4_define([xfconf_version_minor], [1]) +m4_define([xfconf_version_micro], [0]) +m4_define([xfconf_version_build], [EMAIL PROTECTED]@]) +m4_define([xfconf_version_tag], [svn]) +m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_tag(), [svn], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) + +dnl init autoconf +AC_INIT([xfconf], [xfconf_version], [EMAIL PROTECTED]) +AC_PREREQ([2.50]) + +dnl init automake +AM_INIT_AUTOMAKE() +AM_CONFIG_HEADER([config.h]) +dnl AC_DEFINE([WEBSITE], ["http://spuriousinterrupt.org/projects/xfconf";], +dnl [Location of the xfconf website]) +AM_MAINTAINER_MODE + +dnl check for UNIX variants +AC_AIX +AC_ISC_POSIX +AC_MINIX + +dnl check for basic programs +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_INSTALL +AC_PROG_LIBTOOL +dnl AC_PROG_INTLTOOL([0.31], [no-xml]) +dnl AC_PROG_MAKE_SET +AC_CHECK_PROGS([PERL], [perl5 perl]) + +dnl check for standard header files +AC_HEADER_STDC +AC_CHECK_HEADERS([errno.h fcntl.h grp.h \ + signal.h stdlib.h string.h \ + sys/stat.h sys/time.h sys/types.h sys/wait.h \ + unistd.h]) +dnl AC_CHECK_FUNCS([fdwalk getdtablesize setsid sysconf]) + +dnl version information +XFCONF_VERSION=xfconf_version +LIBXFCONF_VERSION_API=libxfconf_version_api +LIBXFCONF_VERINFO=libxfconf_verinfo +LIBXFCONF_GTK_VERSION_API=libxfconf_gtk_version_api +LIBXFCONF_GTK_VERINFO=libxfconf_gtk_verinfo +AC_SUBST(XFCONF_VERSION) +AC_SUBST(LIBXFCONF_VERSION_API) +AC_SUBST(LIBXFCONF_VERINFO) +AC_SUBST(LIBXFCONF_GTK_VERSION_API) +AC_SUBST(LIBXFCONF_GTK_VERINFO) + +dnl Check for i18n support +XDT_I18N([EMAIL PROTECTED]@]) + +dnl Check for X11 installed +dnl XDT_CHECK_LIBX11_REQUIRE + +dnl required +XDT_CHECK_PACKAGE([GLIB], [gobject-2.0], [2.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) +dnl XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) +XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72]) + +dnl make xsettings daemon optional (so gtk dep is optional) +AC_ARG_ENABLE([xsettings-daemon], + [AC_HELP_STRING([--disable-xsettings-daemon], + [Don't build the XSETTINGS daemon (default=yes)])], + [build_xfsettingsd=$enableval], + [build_xfsettingsd=yes]) +AM_CONDITIONAL([BUILD_XFSETTINGSD], [test "x$build_xfsettingsd" = "xyes"]) + +dnl make xfconf-gtk lib optional (so gtk dep is optional) +AC_ARG_ENABLE([xfconf-gtk], + [AC_HELP_STRING([--disable-xfconf-gtk], + [Don't build xfconf-gtk convenience library (default=yes)])], + [build_xfconf_gtk=$enableval], + [build_xfconf_gtk=yes]) +AM_CONDITIONAL([BUILD_XFCONF_GTK], [test "x$build_xfconf_gtk" = "xyes"]) + +if test "x$build_xfsettingsd" = "xyes" -o "x$build_xfconf_gtk" = "xyes"; then + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0]) +fi + +dnl ******************************** +dnl Check for XKB (xkb-settings) *** +dnl ******************************** +AC_ARG_ENABLE([xkb], +AC_HELP_STRING([--enable-xkb], [try to use the XKB extension]) +AC_HELP_STRING([--disable-xkb], [don't try to use the XKB extension]), + [], [enable_xkb=yes]) +XKB_LIBS= +if test x"$enable_xkb" = x"yes"; then + AC_CHECK_LIB(Xext, XkbLibraryVersion, + [XKB_LIBS="-lXi" + AC_DEFINE([HAVE_XKB], [1], [Define if XInput is present])], + [],[$LIBX11_LIBS -lXi]) +fi +AC_SUBST([XKB_LIBS]) + +dnl check alignment for struct returns +AC_DEFUN([BT_GLIB_CHECK_ALIGNOF], +[ + saved_CFLAGS="$CFLAGS" + saved_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_CHECK_ALIGNOF([$1], [#include <glib.h>]) + CFLAGS="$saved_CFLAGS" + LIBS="$saved_LIBS" +]) +BT_GLIB_CHECK_ALIGNOF(guchar) +BT_GLIB_CHECK_ALIGNOF(gchar) +BT_GLIB_CHECK_ALIGNOF(guint16) +BT_GLIB_CHECK_ALIGNOF(gint16) +BT_GLIB_CHECK_ALIGNOF(guint32) +BT_GLIB_CHECK_ALIGNOF(gint32) +BT_GLIB_CHECK_ALIGNOF(guint64) +BT_GLIB_CHECK_ALIGNOF(gint64) +BT_GLIB_CHECK_ALIGNOF(gfloat) +BT_GLIB_CHECK_ALIGNOF(gdouble) +BT_GLIB_CHECK_ALIGNOF(gboolean) +BT_GLIB_CHECK_ALIGNOF(gpointer) + +dnl gtk-doc +GTK_DOC_CHECK([1.0]) + +dnl backends + +dnl always build the perchannel-xml backend +xfconf_backend_perchannel_xml=yes +AM_CONDITIONAL([BUILD_XFCONF_BACKEND_PERCHANNEL_XML], + [test "x$xfconf_backend_perchannel_xml" = "xyes"]) +if test "x$xfconf_backend_perchannel_xml" = "xyes"; then + AC_DEFINE([BUILD_XFCONF_BACKEND_PERCHANNEL_XML], [1], + [Define if the perchannel-xml backend should be built]) +fi + +dnl check for debugging support +XDT_FEATURE_DEBUG +dnl if test "x$enable_debug" = "xfull"; then +dnl if test "x$CC" = "xgcc"; then +dnl CFLAGS="$CFLAGS -fno-strict-aliasing" +dnl fi +dnl fi + +AC_ARG_ENABLE([checks], + AC_HELP_STRING([--enable-checks], + [Enables some runtime checks for libxfconf that print debugging information at a slight cost to library code size and speed]), + [enable_checks=yes]) +if test "x$enable_checks" = "xyes"; then + AC_DEFINE([XFCONF_ENABLE_CHECKS], [1], + [Define if runtime checks should be performed]) +fi + +dnl check whether the compiler supports the visibility attribute +AC_ARG_ENABLE([visibility], + AC_HELP_STRING([--disable-visibility], + [Don't use ELF visibility attributes]), + [], [enable_visibility=yes]) +have_gnuc_visibility=no +if test "x$enable_visibility" != "xno"; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror" + AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE( + [ + void __attribute__ ((visibility("default"))) test_default (void) {} + void __attribute__ ((visibility("hidden"))) test_hidden (void) {} + int main (int argc, char **argv) { test_default (); test_hidden (); return 0; } + ]), + [ + have_gnuc_visibility=yes + AC_MSG_RESULT([yes]) + ], + [ + AC_MSG_RESULT([no]) + ]) + CFLAGS="$save_CFLAGS" +fi +if test "x$have_gnuc_visibility" = "xyes"; then + CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" +fi +AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"]) + +AC_ARG_ENABLE([profiling], + AC_HELP_STRING([--enable-profiling], + [Enable gprof profiling support]), + [enable_profiling=yes]) +if test "x$enable_profiling" = "xyes"; then + AC_DEFINE([XFCONF_ENABLE_PROFILING], [1], + [Define if gprof profiling should be compiled in]) +fi +AM_CONDITIONAL([ENABLE_PROFILING], [test "x$enable_profiling" = "xyes"]) + +AC_OUTPUT([ +Makefile +common/Makefile +docs/Makefile +docs/reference/Makefile +docs/reference/version.xml +docs/spec/Makefile +docs/xfsettingsd/Makefile +po/Makefile.in +tests/Makefile +tests/set-properties/Makefile +tests/has-properties/Makefile +tests/get-properties/Makefile +tests/remove-properties/Makefile +tests/property-changed-signal/Makefile +xfconf/Makefile +xfconf/libxfconf-0.pc +xfconf-query/Makefile +xfconfd/Makefile +xfsettingsd/Makefile +]) _______________________________________________ Xfce4-commits mailing list [email protected] http://foo-projects.org/mailman/listinfo/xfce4-commits
