libxfce4mcs changes and cleanups
Benedikt Meurer
Benedikt.Meurer at unix-ag.uni-siegen.de
Thu Feb 27 15:34:49 CET 2003
Hello,
I did some cleanups and changes to libxfce4mcs. To apply the changes:
1) apply the .diff
2) untar the .tar.gz in libxfce4mcs
3) remove acconfig.h (this is obsolete)
4) Try if it works for Linux too ;)
regards,
Benedikt
--
Those who do not understand Unix are condemned to reinvent it, poorly.
-- Henry Spencer
-------------- next part --------------
Index: Makefile.am
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/libxfce4mcs/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- Makefile.am 27 Jan 2003 10:44:37 -0000 1.4
+++ Makefile.am 27 Feb 2003 14:30:41 -0000
@@ -9,7 +9,4 @@
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
-
+ACLOCAL_AMFLAGS = -I m4
Index: autogen.sh
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/libxfce4mcs/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh 25 Feb 2003 21:22:11 -0000 1.4
+++ autogen.sh 27 Feb 2003 14:30:42 -0000
@@ -6,6 +6,8 @@
DIE=0
+ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
+
(test -f $srcdir/configure.in) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level package directory"
Index: configure.in
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/libxfce4mcs/configure.in,v
retrieving revision 1.15
diff -u -r1.15 configure.in
--- configure.in 24 Feb 2003 23:07:00 -0000 1.15
+++ configure.in 27 Feb 2003 14:30:42 -0000
@@ -18,66 +18,33 @@
AM_MAINTAINER_MODE
+AC_DISABLE_STATIC
+
AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS
AC_PROG_LIBTOOL
AC_PROG_YACC
-AC_SUBST(LIBTOOL_DEPS)
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
dnl libtool versioning from libxfcegui4
-
AC_SUBST(LIBXFCE4MCS_CURRENT)
AC_SUBST(LIBXFCE4MCS_REVISION)
AC_SUBST(LIBXFCE4MCS_AGE)
-dnl
-dnl Check for -lSM
-dnl
-
-AC_PATH_XTRA
-
AC_HEADER_STDC
AC_CHECK_HEADERS(stdlib.h string.h unistd.h)
-AC_CHECK_LIB(X11, main,, AC_MSG_ERROR([libX11 is missing from your system: Make sure you have both the X Window System libraries and development headers correctly installed]), $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS)
-
-# ensure correct rpath handling for X11 library directory
-if test "x$x_libraries" != "x"; then
- X_LIBS="-Wl,-R$x_libraries $X_LIBS"
-fi
-
-SM_LIBS=""
-sm_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-HAVE_SM=true
-AC_CHECK_LIB(SM, SmcSaveYourselfDone,
- [SM_LIBS="$X_LIBS -lSM -lICE"],HAVE_SM=false,
- $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS -lICE)
-AC_CHECK_HEADERS(X11/SM/SMlib.h,,HAVE_SM=false)
-if test "$HAVE_SM" = true; then
- AC_DEFINE(HAVE_LIBSM, 1, "have_libsm")
-fi
-
-AC_CHECK_HEADER(X11/extensions/MITMisc.h, AC_DEFINE(HAVE_X11_EXTENSIONS_MITMISC_H, 1, [Define to 1 if X11/extensions/MITMisc.h is available.]),,[#include <X11/Xlib.h>])
-AC_CHECK_HEADER(X11/XKBlib.h, AC_DEFINE(HAVE_X11_XKBLIB_H, 1, [Define to 1 if X11/XKBlib.h is available.]),,[#include <X11/Xlib.h>])
-
-AC_SUBST(SM_LIBS)
-CPPFLAGS="$sm_save_cppflags"
-
-AC_ARG_ENABLE(debug, [ --enable-debug use this option if you want to debug xfwm4], [ AC_DEFINE(DEBUG, 1, [Define to 1 for debug.]) ],)
-
-GLIB_REQUIRED_VERSION=2.0.0
-
-AC_DEFINE_UNQUOTED(GLIB_REQUIRED_VERSION, $GLIB_REQUIRED_VERSION, [Define glib required version.])
+dnl Check for X11 installed
+AM_LIBX11_REQUIRE
+AM_LIBSM
-AC_SUBST(GLIB_REQUIRED_VERSION)
+dnl Check whether debugging should be enabled
+AM_DEBUG_SUPPORT
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0.0)
AC_OUTPUT([
libxfce4mcs.spec
Index: libxfce4mcs/Makefile.am
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/libxfce4mcs/libxfce4mcs/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- libxfce4mcs/Makefile.am 17 Jan 2003 23:48:24 -0000 1.2
+++ libxfce4mcs/Makefile.am 27 Feb 2003 14:30:42 -0000
@@ -18,16 +18,25 @@
mcs-manager.c \
mcs-manager.h
-libxfce4mcs_manager_la_LDFLAGS = \
+libxfce4mcs_manager_la_LDFLAGS = \
+ -export-dynamic \
-version-info $(LIBXFCE4MCS_CURRENT:)$(LIBXFCE4MCS_REVISION):$(LIBXFCE4MCS_AGE) \
- -export-symbols-regex "^[^_].*"
-
-libxfce4mcs_manager_la_LIBADD = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@
-
-libxfce4mcs_manager_la_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ \
--DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED
-
+ -export-symbols-regex "^[^_].*" \
+ @LIBSM_LDFLAGS@ \
+ @LIBX11_LDFLAGS@
+
+libxfce4mcs_manager_la_LIBADD = \
+ @LIBS@ \
+ @GLIB_LIBS@ \
+ @LIBSM_LIBS@ \
+ @LIBX11_LIBS@
+
+libxfce4mcs_manager_la_CFLAGS = \
+ @CFLAGS@ \
+ @GLIB_CFLAGS@ \
+ @LIBSM_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
+ -DG_DISABLE_DEPRECATED
libxfce4mcs_clientincludedir = $(includedir)/xfce4/libxfce4mcs
@@ -41,16 +50,25 @@
mcs-client.c \
mcs-client.h
-libxfce4mcs_client_la_LDFLAGS = \
+libxfce4mcs_client_la_LDFLAGS = \
+ -export-dynamic \
-version-info $(LIBXFCE4MCS_CURRENT:)$(LIBXFCE4MCS_REVISION):$(LIBXFCE4MCS_AGE) \
- -export-symbols-regex "^[^_].*"
-
-libxfce4mcs_client_la_LIBADD = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@
-
-libxfce4mcs_client_la_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ \
--DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED
-
+ -export-symbols-regex "^[^_].*" \
+ @LIBSM_LDFLAGS@ \
+ @LIBX11_LDFLAGS@
+
+libxfce4mcs_client_la_LIBADD = \
+ @LIBS@ \
+ @GLIB_LIBS@ \
+ @LIBSM_LIBS@ \
+ @LIBX11_LIBS@
+
+libxfce4mcs_client_la_CFLAGS = \
+ @CFLAGS@ \
+ @GLIB_CFLAGS@ \
+ @LIBSM_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
+ -DG_DISABLE_DEPRECATED
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxfce4mcs-manager-1.0.pc libxfce4mcs-client-1.0.pc
Index: libxfce4mcs/libxfce4mcs-client-1.0.pc.in
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/libxfce4mcs/libxfce4mcs/libxfce4mcs-client-1.0.pc.in,v
retrieving revision 1.4
diff -u -r1.4 libxfce4mcs-client-1.0.pc.in
--- libxfce4mcs/libxfce4mcs-client-1.0.pc.in 23 Feb 2003 19:39:07 -0000 1.4
+++ libxfce4mcs/libxfce4mcs-client-1.0.pc.in 27 Feb 2003 14:30:42 -0000
@@ -7,5 +7,5 @@
Description: libxfce4mcs-client
Requires: glib-2.0
Version: @VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@ -lxfce4mcs-client
-Cflags: @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -I${includedir}/xfce4
+Libs: -Wl,-R${libdir} -L${libdir} @LIBS@ @GLIB_LIBS@ @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ -lxfce4mcs-client
+Cflags: @LIBX11_CFLAGS@ @LIBSM_CFLAGS@ @GLIB_CFLAGS@ -I${includedir}/xfce4
Index: libxfce4mcs/libxfce4mcs-manager-1.0.pc.in
===================================================================
RCS file: /cvsroot/xfce/xfce-devel/libxfce4mcs/libxfce4mcs/libxfce4mcs-manager-1.0.pc.in,v
retrieving revision 1.4
diff -u -r1.4 libxfce4mcs-manager-1.0.pc.in
--- libxfce4mcs/libxfce4mcs-manager-1.0.pc.in 23 Feb 2003 19:39:07 -0000 1.4
+++ libxfce4mcs/libxfce4mcs-manager-1.0.pc.in 27 Feb 2003 14:30:42 -0000
@@ -7,5 +7,5 @@
Description: libxfce4mcs-manager
Requires: glib-2.0
Version: @VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@ -lxfce4mcs-manager
-Cflags: @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -I${includedir}/xfce4
+Libs: -Wl,-R${libdir} -L${libdir} @LIBS@ @GLIB_LIBS@ @LIBX11_LDFLAGS@ @LIBSM_LDFLAGS@ -lxfce4mcs-manager
+Cflags: @LIBX11_CFLAGS@ @LIBSM_LDFLAGS@ @GLIB_CFLAGS@ -I${includedir}/xfce4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: libxfce4mcs-m4.tar.gz
Type: application/x-tar-gz
Size: 1268 bytes
Desc: not available
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20030227/7370fb19/attachment.bin>
More information about the Xfce4-dev
mailing list