From abf55dfec026a0a90340a3d79662175cf841564c Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Thu, 13 Jan 2000 23:05:46 +0000 Subject: [PATCH] Massive changes to build system to permit gnome-2.0 compilation. From here 2000-01-13 Jonathan Blandford * configure.in: Massive changes to build system to permit gnome-2.0 compilation. From here on out, you need gnome-2.0 or greater installed. You will prolly not be able to get this to work. --- ChangeLog | 6 ++ Makefile.am | 7 +- autogen.sh | 128 +++++++++++++++++++++++++++- capplets/mime-type/Makefile.am | 4 +- capplets/theme-switcher/Makefile.am | 4 +- capplets/url-properties/Makefile.am | 4 +- capplets/wm-properties/Makefile.am | 4 +- configure.in | 24 +----- 8 files changed, 146 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index d26c3869a..37de8daa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-01-13 Jonathan Blandford + + * configure.in: Massive changes to build system to permit + gnome-2.0 compilation. From here on out, you need gnome-2.0 or + greater installed. + 2000-01-07 Mikael Djurfeldt * capplets/background-properties/property-background.c diff --git a/Makefile.am b/Makefile.am index 9405179ac..9c34a413c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ always_built_SUBDIRS = control-center capplets idl -SUBDIRS = intl po macros \ +SUBDIRS = intl po \ $(always_built_SUBDIRS) #DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) @@ -12,7 +12,4 @@ EXTRA_DIST = control-center.spec.in dist-hook: control-center.spec cp control-center.spec $(distdir) -## to automatically rebuild aclocal.m4 if any of the macros in `macros/' change -@MAINT@include macros/macros.dep -@MAINT@macros/macros.dep: macros/Makefile.am -@MAINT@ cd macros && $(MAKE) macros.dep + diff --git a/autogen.sh b/autogen.sh index 2c62b4e46..8102af811 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,8 +10,132 @@ PKG_NAME="GNOME Control Center" && test -d $srcdir/capplets \ && test -d $srcdir/control-center) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level gnome directory" + echo " top-level "\`$PKG_NAME\'" directory" exit 1 } -. $srcdir/macros/autogen.sh +ORIGDIR=`pwd` +cd $srcdir +PROJECT=control-center +TEST_TYPE=-f + +DIE=0 + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $PROJECT." + echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 +} + +(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && { + (libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`libtool' installed to compile $PROJECT." + echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + } +} + +grep "^AM_GNU_GETTEXT" configure.in >/dev/null && { + grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ + (gettext --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`gettext' installed to compile $PROJECT." + echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + } +} + +if test "$DIE" -eq 1; then + exit 1 +fi + + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +case $CC in +*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; +esac + +for coin in `find . -name configure.in -print` +do + dr=`dirname $coin` + if test -f $dr/NO-AUTO-GEN; then + echo skipping $dr -- flagged as no auto-gen + else + echo processing $dr + macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` + ( cd $dr + aclocalinclude="$ACLOCAL_FLAGS" + for k in $macrodirs; do + if test -d $k; then + aclocalinclude="$aclocalinclude -I $k" + ##else + ## echo "**Warning**: No such directory \`$k'. Ignored." + fi + done + if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then + if grep "sed.*POTFILES" configure.in >/dev/null; then + : do nothing -- we still have an old unmodified configure.in + else + echo "Creating $dr/aclocal.m4 ..." + test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 + echo "Running gettextize... Ignore non-fatal messages." + echo "no" | gettextize --force --copy + echo "Making $dr/aclocal.m4 writable ..." + test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 + fi + fi + if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then + echo "Creating $dr/aclocal.m4 ..." + test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 + echo "Running gettextize... Ignore non-fatal messages." + echo "no" | gettextize --force --copy + echo "Making $dr/aclocal.m4 writable ..." + test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 + fi + if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + echo "Running aclocal $aclocalinclude ..." + aclocal $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu $am_opt ..." + automake --add-missing --gnu $am_opt + echo "Running autoconf ..." + autoconf + ) + fi +done + +conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c + +cd "$ORIGDIR" + +if test x$NOCONFIGURE = x; then + echo Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" \ + && echo Now type \`make\' to compile $PROJECT || exit 1 +else + echo Skipping configure process. +fi + diff --git a/capplets/mime-type/Makefile.am b/capplets/mime-type/Makefile.am index c2fd6bfdf..5683c1b7f 100644 --- a/capplets/mime-type/Makefile.am +++ b/capplets/mime-type/Makefile.am @@ -12,8 +12,8 @@ mime_type_capplet_SOURCES = mime-type-capplet.c\ new-mime-window.h new-mime-window.c mime_type_capplet_LDADD = ../../control-center/libcapplet.la \ - $(GNOME_LIBDIR) $(ORB_LIBS) \ - $(GNOMEUI_LIBS) $(INTLLIBS) -lgnorba + $(GNOME_LIBS) $(ORBIT_LIBS) \ + $(GNOMEUI_LIBS) $(INTLLIBS) EXTRA_DIST = \ mime-type.desktop diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am index b2ce3c6f3..444eb9068 100644 --- a/capplets/theme-switcher/Makefile.am +++ b/capplets/theme-switcher/Makefile.am @@ -20,9 +20,9 @@ theme_selector_capplet_SOURCES = \ theme_selector_capplet_LDFLAGS = ../../control-center/libcapplet.la `imlib-config --libs` theme_selector_capplet_LDADD = ../../control-center/libcapplet.la \ - $(GNOME_LIBDIR) $(ORB_LIBS) \ + $(GNOME_LIBS) $(ORBIT_LIBS) \ $(GNOMEUI_LIBS) $(INTLLIBS) \ - -lImlib $(GTKXMHTML_LIBS) -lgnorba + -lImlib $(OAF_LIBS) $(GCONF_LIBS) EXTRA_DIST = \ theme-selector.desktop diff --git a/capplets/url-properties/Makefile.am b/capplets/url-properties/Makefile.am index ec32773a9..5d2b44a85 100644 --- a/capplets/url-properties/Makefile.am +++ b/capplets/url-properties/Makefile.am @@ -10,8 +10,8 @@ bin_PROGRAMS = url-properties url_properties_SOURCES = url-properties.c url_properties_LDADD = ../../control-center/libcapplet.la \ - $(GNOME_LIBDIR) $(ORB_LIBS) \ - $(GNOMEUI_LIBS) $(INTLLIBS) -lgnorba + $(GNOME_LIBS) $(ORBIT_LIBS) \ + $(GNOMEUI_LIBS) $(INTLLIBS) EXTRA_DIST = \ diff --git a/capplets/wm-properties/Makefile.am b/capplets/wm-properties/Makefile.am index 3e7640965..726498ebe 100644 --- a/capplets/wm-properties/Makefile.am +++ b/capplets/wm-properties/Makefile.am @@ -15,8 +15,8 @@ wm_properties_capplet_SOURCES = \ wm_properties_capplet_LDADD = \ ../../control-center/libcapplet.la \ -$(GNOME_LIBDIR) $(ORB_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) \ --lgnorba $(IMLIB_LIBS) +$(GNOME_LIBS) $(ORBIT_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) \ +$(IMLIB_LIBS) EXTRA_DIST = wm-properties.desktop diff --git a/configure.in b/configure.in index 8cba8f801..74f892ab8 100644 --- a/configure.in +++ b/configure.in @@ -5,15 +5,13 @@ AM_INIT_AUTOMAKE(control-center, 1.0.51) AM_MAINTAINER_MODE -AM_ACLOCAL_INCLUDE(macros) - dnl dnl let applications configure for gnome dnl gnome_cv_use_gnome=yes -GNOME_INIT +AM_PATH_GNOME AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS @@ -22,9 +20,6 @@ AM_PROG_LIBTOOL AM_PROG_LEX AC_PROG_YACC -GNOME_COMPILE_WARNINGS - -GNOME_X_CHECKS dnl utility conditional AM_CONDITIONAL(FALSE, test "x" = "y") @@ -50,19 +45,9 @@ dnl keyboard-properties-capplet AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc") AC_SUBST(XF86MISC_LIBS) -for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do - if test -f $dir/orbit-idl ; then - orbit_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'` - break - fi -done - -ORB_LIBS="$ORBIT_LIBS" -ORB_CFLAGS="$ORBIT_CFLAGS" - -AC_SUBST(ORB_LIBS) -AC_SUBST(ORB_CFLAGS) - +AM_PATH_ORBIT(0.5.1, , AC_MSG_ERROR([You must have ORBit installed.])) +AM_PATH_OAF(0.1.0, , AC_MSG_ERROR([You must have OAF installed.])) +AM_PATH_GCONF(0.1.0, , AC_MSG_ERROR([You must have GConf installed.]), gconf-gtk) dnl esd-manager have_libesd=no AM_PATH_ESD(,have_libesd=yes, @@ -88,7 +73,6 @@ AC_OUTPUT([ control-center.spec Makefile po/Makefile.in -macros/Makefile control-center/Makefile capplets/Makefile capplets/mouse-properties/Makefile