Commit 2b347b4d authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin

removed lots of unused cruft.

2001-10-05  Mark McLoughlin <mark@skynet.ie>

        * configure.in: removed lots of unused cruft.

        * gnome-terminal/Makefile.am, gsm/Makefile.am,
          panel/Makefile.am: cleaned up generated file handling.
parent 2dd814cb
2001-10-05 Mark McLoughlin <mark@skynet.ie>
* configure.in: removed lots of unused cruft.
* gnome-terminal/Makefile.am, gsm/Makefile.am,
panel/Makefile.am: cleaned up generated file handling.
2001-09-27 Mark McLoughlin <mark@skynet.ie>
* configure.in: add -lm to libpng check for non-glibc systems.
......
2001-10-05 Mark McLoughlin <mark@skynet.ie>
* configure.in: removed lots of unused cruft.
* gnome-terminal/Makefile.am, gsm/Makefile.am,
panel/Makefile.am: cleaned up generated file handling.
2001-09-27 Mark McLoughlin <mark@skynet.ie>
* configure.in: add -lm to libpng check for non-glibc systems.
......
AC_PREREQ(2.52)
AC_INIT(panel)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(gnome-core, 1.5.0)
......@@ -6,14 +7,8 @@ AM_INIT_AUTOMAKE(gnome-core, 1.5.0)
AM_MAINTAINER_MODE
GNOME_COMMON_INIT
AM_PROG_XML_I18N_TOOLS
dnl
dnl let applications configure for gnome
dnl
gnome_cv_use_gnome=yes
AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS
......@@ -22,8 +17,7 @@ AM_PROG_LIBTOOL
AM_PROG_LEX
AC_PROG_YACC
AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
GNOME_COMPILE_WARNINGS(error)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
dnl ==========================================================================
dnl
......@@ -31,12 +25,8 @@ dnl Library Dependencies, uses pkg-config to detect correct version, etc
dnl
dnl ==========================================================================
GNOME_REQUIRE_PKGCONFIG
GNOME_PLATFORM_GNOME_2(yes)
dnl If you add a version number here, you *must* add an AC_SUBST line for
dnl it too, or it will never make it into the spec file!
......@@ -112,50 +102,20 @@ dnl ------------------
dnl | Language Support |---------------------------------------
dnl ------------------
ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sp sr sv ta tr uk wa zh_CN zh_TW"
AM_GNOME2_GETTEXT
# AM_GNOME_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
gnomelocaledir='${prefix}/share/locale'
AC_SUBST(gnomelocaledir)
AM_GLIB_GNU_GETTEXT
dnl -----------------------------------------------------------
dnl -------------------------------
dnl | Dynamically Loading Libraries |--------------------------
dnl | Headers |--------------------------
dnl -------------------------------
AC_CHECK_HEADERS(dlfcn.h dl.h syslog.h tcpd.h)
AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld",[
AC_CHECK_FUNCS(dlopen, DL_LIB="",
AC_MSG_ERROR(Dynamic linking is not available on this platform. Some
apps, like panel, will not run properly.))
])])
AC_SUBST(DL_LIB)
dnl -----------------------------------------------------------
dnl ----------------------
dnl | Configure Easter Egg |-----------------------------------
dnl ----------------------
AC_MSG_CHECKING(for Configure Easter Egg version >= 6.38)
AC_MSG_RESULT(found)
dnl -----------------------------------------------------------
dnl --------
dnl | libpng |-------------------------------------------------
dnl --------
PNG_LIBS=
AC_CHECK_LIB(png, png_init_io, [
PNG_LIBS="-lpng"],[
AC_MSG_ERROR(libpng is required for gnome-core)],-lm)
AC_SUBST(PNG_LIBS)
AC_CHECK_HEADERS(syslog.h tcpd.h)
dnl -----------------------------------------------------------
dnl ---------------
dnl | gnome-session |------------------------------------------
dnl ---------------
dnl
AC_MSG_CHECKING([Whether libgnomeui was built with session management])
case "$GNOME_SESSION_LIBS" in
*-lSM*)
......@@ -170,7 +130,6 @@ if test "$GNOME_HAVE_SM" = no ; then
AC_MSG_WARN([Session management support not built into libgnomeui; gnome-session will not be built])
fi
AM_CONDITIONAL(SESSION, test "$GNOME_HAVE_SM" = yes)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
dnl -----------------------------------------------------------
......@@ -338,18 +297,6 @@ AC_DEFINE_UNQUOTED(KDE_DOCDIR, "$kde_docdir")
dnl -----------------------------------------------------------
dnl --------------
dnl | ScrollKeeper |-------------------------------------------
dnl --------------
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
if test x$SCROLLKEEPER_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga)
fi
AC_SUBST(SCROLLKEEPER_REQUIRED)
dnl -----------------------------------------------------------
dnl AC_CONFIG_SUBDIRS(gemvt)
dnl ---------------
dnl | gtk-doc stuff |------------------------------------------
dnl ---------------
......
## Process this file with automake to produce Makefile.in.
# CFLAGS += -Wall \
# -Wpointer-arith \
# -Wmissing-prototypes -Wmissing-declarations
## We require new-style dependency handling.
AUTOMAKE_OPTIONS = 1.3
......@@ -43,9 +38,6 @@ CORBA_SRCLIST = \
gnome-panel-common.c \
gnome-panel.h
# try to make these get cleaned properly
CLEANFILES += $(CORBA_SRCLIST)
$(CORBA_SRCLIST): $(top_srcdir)/idl/gnome-panel.idl $(ORBIT_IDL)
$(ORBIT_IDL) -I $(BONOBO_IDLDIR) $(top_srcdir)/idl/gnome-panel.idl
......@@ -206,8 +198,6 @@ panel_2_LDADD=\
panel_2_LDFLAGS=-export-dynamic
MAINTAINERCLEANFILES = $(CORBA_SRCLIST)
EXTRA_DIST = \
APPLET_WRITING \
panel.server.in \
......@@ -280,3 +270,8 @@ $(srcdir)/panel-typebuiltins.h: @REBUILD@ Makefile.am $(panel_headers)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpanelapplet-2.0.pc
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir) ; rm -f $(CLEANFILES)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment