diff options
31 files changed, 161 insertions, 162 deletions
diff --git a/Makefile.in b/Makefile.in index 4af094c0..57a57b8f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -111,12 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/config.h.in b/config.h.in index 138f4e64..1d714273 100644 --- a/config.h.in +++ b/config.h.in @@ -27,6 +27,9 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H +/* Define if you have gconf-2.0 >= 2.4.0 */ +#undef HAVE_GCONF + /* Define to 1 if you have the `getaddrinfo' function. */ #undef HAVE_GETADDRINFO @@ -39,9 +42,6 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if you have libgnome-2.0 >= 2.4.0 */ -#undef HAVE_GNOME - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac,v 1.83 2004/11/01 16:10:54 benny Exp . +# From configure.ac Id: configure.ac,v 1.84 2004/11/01 21:00:11 benny Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for xfce4-session 4.1.92. # @@ -470,7 +470,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_OS_CYGWIN_TRUE HAVE_OS_CYGWIN_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS LIBSM_CFLAGS LIBSM_LDFLAGS LIBSM_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir PKG_CONFIG LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR GNOME_CFLAGS GNOME_LIBS GNOME_REQUIRED_VERSION ICEAUTH RM LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_OS_CYGWIN_TRUE HAVE_OS_CYGWIN_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS LIBSM_CFLAGS LIBSM_LDFLAGS LIBSM_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir PKG_CONFIG LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR GCONF_CFLAGS GCONF_LIBS GCONF_REQUIRED_VERSION ICEAUTH RM LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1047,8 +1047,9 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-gnome Enable checking for Gnome support (default=yes) - --disable-gnome Disable checking for Gnome support + --enable-gconf Enable checking for Assistive technologies support + (default=no) + --disable-gconf Disable checking for Assistive technologies support --enable-debug=yes|no|full Build with debugging support --disable-debug Include no debugging support default @@ -5430,7 +5431,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5433 "configure"' > conftest.$ac_ext + echo '#line 5434 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6524,7 +6525,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6527:" \ +echo "$as_me:6528:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -7558,11 +7559,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7561: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7562: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7565: \$? = $ac_status" >&5 + echo "$as_me:7566: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7791,11 +7792,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7795: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7798: \$? = $ac_status" >&5 + echo "$as_me:7799: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7851,11 +7852,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7854: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7855: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7858: \$? = $ac_status" >&5 + echo "$as_me:7859: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9185,7 +9186,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 9188 "configure"' > conftest.$ac_ext + echo '#line 9189 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10056,7 +10057,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10059 "configure" +#line 10060 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10154,7 +10155,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10157 "configure" +#line 10158 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12333,11 +12334,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12336: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12337: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12340: \$? = $ac_status" >&5 + echo "$as_me:12341: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12393,11 +12394,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12396: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12397: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12400: \$? = $ac_status" >&5 + echo "$as_me:12401: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12904,7 +12905,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12907 "configure"' > conftest.$ac_ext + echo '#line 12908 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13775,7 +13776,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13778 "configure" +#line 13779 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13873,7 +13874,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13876 "configure" +#line 13877 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14700,11 +14701,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14703: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14704: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14707: \$? = $ac_status" >&5 + echo "$as_me:14708: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14760,11 +14761,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14763: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14764: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14767: \$? = $ac_status" >&5 + echo "$as_me:14768: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16074,7 +16075,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 16077 "configure"' > conftest.$ac_ext + echo '#line 16078 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16815,11 +16816,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16819: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16822: \$? = $ac_status" >&5 + echo "$as_me:16823: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17048,11 +17049,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17052: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17055: \$? = $ac_status" >&5 + echo "$as_me:17056: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17108,11 +17109,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17111: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17112: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17115: \$? = $ac_status" >&5 + echo "$as_me:17116: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18442,7 +18443,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 18445 "configure"' > conftest.$ac_ext + echo '#line 18446 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -19313,7 +19314,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 19316 "configure" +#line 19317 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19411,7 +19412,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 19414 "configure" +#line 19415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -24463,18 +24464,18 @@ echo "${ECHO_T}$XFCE_MCS_MANAGER_PLUGINSDIR" >&6 - # Check whether --enable-gnome or --disable-gnome was given. -if test "${enable_gnome+set}" = set; then - enableval="$enable_gnome" - ac_cv_GNOME_check=$enableval + # Check whether --enable-gconf or --disable-gconf was given. +if test "${enable_gconf+set}" = set; then + enableval="$enable_gconf" + ac_cv_GCONF_check=$enableval else - ac_cv_GNOME_check=yes + ac_cv_GCONF_check=no fi; - if test x"$ac_cv_GNOME_check" = x"yes"; then - echo "$as_me:$LINENO: checking for libgnome-2.0 >= 2.4.0" >&5 -echo $ECHO_N "checking for libgnome-2.0 >= 2.4.0... $ECHO_C" >&6 - if $PKG_CONFIG --atleast-version=2.4.0 libgnome-2.0 2> /dev/null; then + if test x"$ac_cv_GCONF_check" = x"yes"; then + echo "$as_me:$LINENO: checking for gconf-2.0 >= 2.4.0" >&5 +echo $ECHO_N "checking for gconf-2.0 >= 2.4.0... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-version=2.4.0 gconf-2.0 2> /dev/null; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -24532,32 +24533,32 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libgnome-2.0 >= 2.4.0" >&5 -echo $ECHO_N "checking for libgnome-2.0 >= 2.4.0... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for gconf-2.0 >= 2.4.0" >&5 +echo $ECHO_N "checking for gconf-2.0 >= 2.4.0... $ECHO_C" >&6 - if $PKG_CONFIG --exists "libgnome-2.0 >= 2.4.0" ; then + if $PKG_CONFIG --exists "gconf-2.0 >= 2.4.0" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes - echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5 -echo $ECHO_N "checking GNOME_CFLAGS... $ECHO_C" >&6 - GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= 2.4.0"` - echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5 -echo "${ECHO_T}$GNOME_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GNOME_LIBS" >&5 -echo $ECHO_N "checking GNOME_LIBS... $ECHO_C" >&6 - GNOME_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= 2.4.0"` - echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5 -echo "${ECHO_T}$GNOME_LIBS" >&6 + echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 + GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.4.0"` + echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 + GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.4.0"` + echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6 else - GNOME_CFLAGS="" - GNOME_LIBS="" + GCONF_CFLAGS="" + GCONF_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0 >= 2.4.0"` - echo $GNOME_PKG_ERRORS + GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.4.0"` + echo $GCONF_PKG_ERRORS fi @@ -24571,20 +24572,20 @@ echo "${ECHO_T}$GNOME_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libgnome-2.0 >= 2.4.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libgnome-2.0 >= 2.4.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 >= 2.4.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gconf-2.0 >= 2.4.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi - GNOME_REQUIRED_VERSION=2.4.0 + GCONF_REQUIRED_VERSION=2.4.0 cat >>confdefs.h <<\_ACEOF -#define HAVE_GNOME 1 +#define HAVE_GCONF 1 _ACEOF - GNOME_FOUND="yes" + GCONF_FOUND="yes" else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -25686,9 +25687,9 @@ s,@XFCE_MCS_MANAGER_CFLAGS@,$XFCE_MCS_MANAGER_CFLAGS,;t t s,@XFCE_MCS_MANAGER_LIBS@,$XFCE_MCS_MANAGER_LIBS,;t t s,@XFCE_MCS_MANAGER_REQUIRED_VERSION@,$XFCE_MCS_MANAGER_REQUIRED_VERSION,;t t s,@XFCE_MCS_MANAGER_PLUGINSDIR@,$XFCE_MCS_MANAGER_PLUGINSDIR,;t t -s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t -s,@GNOME_LIBS@,$GNOME_LIBS,;t t -s,@GNOME_REQUIRED_VERSION@,$GNOME_REQUIRED_VERSION,;t t +s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t +s,@GCONF_LIBS@,$GCONF_LIBS,;t t +s,@GCONF_REQUIRED_VERSION@,$GCONF_REQUIRED_VERSION,;t t s,@ICEAUTH@,$ICEAUTH,;t t s,@RM@,$RM,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff --git a/configure.ac b/configure.ac index 5f322bcb..2ca96784 100644 --- a/configure.ac +++ b/configure.ac @@ -74,8 +74,8 @@ dnl Configure the MCS plugins XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.1.0]) dnl Check for gnome support -BM_DEPEND_CHECK([GNOME], [libgnome-2.0], [2.4.0], [gnome], - [Gnome support], [yes]) +BM_DEPEND_CHECK([GCONF], [gconf-2.0], [2.4.0], [gconf], + [Assistive technologies support], [no]) dnl Check for debugging support BM_DEBUG_SUPPORT diff --git a/docs/C/Makefile.in b/docs/C/Makefile.in index 444e90b2..43f035ca 100644 --- a/docs/C/Makefile.in +++ b/docs/C/Makefile.in @@ -94,12 +94,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/docs/C/images/Makefile.in b/docs/C/images/Makefile.in index 43cd4aaf..40bb89aa 100644 --- a/docs/C/images/Makefile.in +++ b/docs/C/images/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/docs/Makefile.in b/docs/Makefile.in index ff38a4a6..5752b8c7 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -92,12 +92,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/Makefile.in b/engines/Makefile.in index 19d6a12d..16587a29 100644 --- a/engines/Makefile.in +++ b/engines/Makefile.in @@ -90,12 +90,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/balou/Makefile.in b/engines/balou/Makefile.in index 7d63e161..828ed67d 100644 --- a/engines/balou/Makefile.in +++ b/engines/balou/Makefile.in @@ -120,12 +120,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/balou/scripts/Makefile.in b/engines/balou/scripts/Makefile.in index 3cbfa4d3..573d0079 100644 --- a/engines/balou/scripts/Makefile.in +++ b/engines/balou/scripts/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/balou/themes/Default/Makefile.in b/engines/balou/themes/Default/Makefile.in index 1632a7cd..e888b774 100644 --- a/engines/balou/themes/Default/Makefile.in +++ b/engines/balou/themes/Default/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/balou/themes/Makefile.in b/engines/balou/themes/Makefile.in index 211a5897..fb703c59 100644 --- a/engines/balou/themes/Makefile.in +++ b/engines/balou/themes/Makefile.in @@ -90,12 +90,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/mice/Makefile.in b/engines/mice/Makefile.in index 474e435c..544ece36 100644 --- a/engines/mice/Makefile.in +++ b/engines/mice/Makefile.in @@ -114,12 +114,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/engines/simple/Makefile.in b/engines/simple/Makefile.in index afa968ab..33fdc8ee 100644 --- a/engines/simple/Makefile.in +++ b/engines/simple/Makefile.in @@ -107,12 +107,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/icons/128x128/Makefile.in b/icons/128x128/Makefile.in index 27d63833..3185615e 100644 --- a/icons/128x128/Makefile.in +++ b/icons/128x128/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index 7a04111e..42cd6e17 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/icons/64x64/Makefile.in b/icons/64x64/Makefile.in index e9fabd2f..1661827c 100644 --- a/icons/64x64/Makefile.in +++ b/icons/64x64/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/icons/72x72/Makefile.in b/icons/72x72/Makefile.in index 05767885..bc4a45fc 100644 --- a/icons/72x72/Makefile.in +++ b/icons/72x72/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/icons/Makefile.in b/icons/Makefile.in index b2a60587..499d1ec6 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -90,12 +90,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in index faf4dac6..cd9ff7b2 100644 --- a/icons/scalable/Makefile.in +++ b/icons/scalable/Makefile.in @@ -85,12 +85,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/libxfsm/Makefile.in b/libxfsm/Makefile.in index ebdacb35..728cccf3 100644 --- a/libxfsm/Makefile.in +++ b/libxfsm/Makefile.in @@ -117,12 +117,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/settings/Makefile.in b/settings/Makefile.in index a75dcc1d..0dc9ba66 100644 --- a/settings/Makefile.in +++ b/settings/Makefile.in @@ -90,12 +90,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/settings/session/Makefile.in b/settings/session/Makefile.in index 8e34efd9..5c5eb9b5 100644 --- a/settings/session/Makefile.in +++ b/settings/session/Makefile.in @@ -110,12 +110,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/settings/session/session.c b/settings/session/session.c index 31db355c..dda4f93d 100644 --- a/settings/session/session.c +++ b/settings/session/session.c @@ -218,11 +218,7 @@ advanced_create (XfceRc *rc) gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); advanced_gnome = gtk_check_button_new_with_label (_("Launch Gnome services on startup")); -#ifdef HAVE_GNOME gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_gnome), gnome); -#else - gtk_widget_set_sensitive (advanced_gnome, FALSE); -#endif g_signal_connect (G_OBJECT (advanced_gnome), "toggled", G_CALLBACK (config_store), NULL); gtk_box_pack_start (GTK_BOX (vbox), advanced_gnome, FALSE, TRUE, 0); diff --git a/settings/splash/Makefile.in b/settings/splash/Makefile.in index d257c167..56101aa1 100644 --- a/settings/splash/Makefile.in +++ b/settings/splash/Makefile.in @@ -116,12 +116,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/xfce4-session-logout/Makefile.in b/xfce4-session-logout/Makefile.in index cb510b9d..2187c942 100644 --- a/xfce4-session-logout/Makefile.in +++ b/xfce4-session-logout/Makefile.in @@ -108,12 +108,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/xfce4-session/Makefile.in b/xfce4-session/Makefile.in index ec0dc152..959b43b2 100644 --- a/xfce4-session/Makefile.in +++ b/xfce4-session/Makefile.in @@ -138,12 +138,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c index 82f6e440..709080a7 100644 --- a/xfce4-session/shutdown.c +++ b/xfce4-session/shutdown.c @@ -516,10 +516,8 @@ xfsm_shutdown(gint type) { gboolean result; -#ifdef HAVE_GNOME if (compat_gnome) xfsm_compat_gnome_shutdown (); -#endif if (compat_kde) xfsm_compat_kde_shutdown (); diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c index 4e7adecb..a8412910 100644 --- a/xfce4-session/xfsm-compat-gnome.c +++ b/xfce4-session/xfsm-compat-gnome.c @@ -25,8 +25,6 @@ #include <config.h> #endif -#ifdef HAVE_GNOME - #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -54,16 +52,22 @@ #include <libgnome/libgnome.h> #include <libxfce4util/libxfce4util.h> + +#ifdef HAVE_GCONF #include <gconf/gconf-client.h> +#endif #include <xfce4-session/xfsm-compat-gnome.h> +#ifdef HAVE_GCONF #define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility" #define AT_STARTUP_KEY "/desktop/gnome/accessibility/startup/exec_ats" - static GConfClient *gnome_conf_client = NULL; +#endif + + static pid_t gnome_keyring_daemon_pid = 0; static Window gnome_smproxy_window = None; @@ -132,6 +136,7 @@ gnome_keyring_daemon_shutdown (void) } +#ifdef HAVE_GCONF static void gnome_ast_startup (void) { @@ -175,6 +180,7 @@ gnome_ast_startup (void) g_slist_free (list); } } +#endif static void @@ -187,7 +193,7 @@ xfsm_compat_gnome_smproxy_startup (void) gdk_error_trap_push (); /* Set GNOME_SM_PROXY property, since some apps (like OOo) seem to require - * it for property behaviour. Thanks to Jasper/Francois for reporting this. + * it to behave properly. Thanks to Jasper/Francois for reporting this. * This has another advantage, since it prevents people from running * gnome-smproxy in xfce4, which would cause trouble otherwise. */ @@ -239,6 +245,7 @@ xfsm_compat_gnome_startup (XfsmSplashScreen *splash) xfsm_splash_screen_next (splash, _("Starting The Gnome Keyring Daemon")); gnome_keyring_daemon_startup (); +#ifdef HAVE_GCONF /* connect to the GConf daemon */ gnome_conf_client = gconf_client_get_default (); if (gnome_conf_client != NULL) @@ -253,6 +260,7 @@ xfsm_compat_gnome_startup (XfsmSplashScreen *splash) gnome_ast_startup (); } } +#endif } @@ -288,5 +296,3 @@ xfsm_compat_gnome_shutdown (void) xfsm_compat_gnome_smproxy_shutdown (); } -#endif - diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c index 222e46c7..46ed51a4 100644 --- a/xfce4-session/xfsm-startup.c +++ b/xfce4-session/xfsm-startup.c @@ -212,10 +212,8 @@ xfsm_startup_foreign (void) if (compat_kde) xfsm_compat_kde_startup (splash_screen); -#ifdef HAVE_GNOME if (compat_gnome) xfsm_compat_gnome_startup (splash_screen); -#endif } diff --git a/xfsm-shutdown-helper/Makefile.in b/xfsm-shutdown-helper/Makefile.in index b6e491c8..a0d5430c 100644 --- a/xfsm-shutdown-helper/Makefile.in +++ b/xfsm-shutdown-helper/Makefile.in @@ -105,12 +105,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_REQUIRED_VERSION = @GCONF_REQUIRED_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_CFLAGS = @GNOME_CFLAGS@ -GNOME_LIBS = @GNOME_LIBS@ -GNOME_REQUIRED_VERSION = @GNOME_REQUIRED_VERSION@ HAVE_OS_CYGWIN_FALSE = @HAVE_OS_CYGWIN_FALSE@ HAVE_OS_CYGWIN_TRUE = @HAVE_OS_CYGWIN_TRUE@ ICEAUTH = @ICEAUTH@ |