galeon-macros.patch

   1 diff -urN galeon-0.10.4.org/acinclude.m4 galeon-0.10.4/acinclude.m4
   2 --- galeon-0.10.4.org/acinclude.m4      Thu Jan  1 01:00:00 1970
   3 +++ galeon-0.10.4/acinclude.m4  Mon Apr 23 10:21:47 2001
   4 @@ -0,0 +1,135 @@
   5 +AC_DEFUN(AM_PATH_GNOME,
   6 +[dnl
   7 +dnl Get the cflags and libraries from the gnome-config script
   8 +dnl
   9 +AC_ARG_WITH(gnome-prefix,[  --with-gnome-prefix=PFX   Prefix where GNOME is installed (optional)],
  10 +            gnome_config_prefix="$withval", gnome_config_prefix="")
  11 +AC_ARG_WITH(gnome-exec-prefix,[  --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional)],
  12 +            gnome_config_exec_prefix="$withval", gnome_config_exec_prefix="")
  13 +
  14 +  if test x$gnome_config_exec_prefix != x ; then
  15 +     gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix"
  16 +     if test x${GNOME_CONFIG+set} != xset ; then
  17 +        GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config
  18 +     fi
  19 +  fi
  20 +  if test x$gnome_config_prefix != x ; then
  21 +     gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
  22 +     if test x${GNOME_CONFIG+set} != xset ; then
  23 +        GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
  24 +     fi
  25 +  fi
  26 +
  27 +  AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
  28 +  min_gnome_version=ifelse([$1], , 1.1.0, $1)
  29 +
  30 +  AC_MSG_CHECKING(for GNOME - version >= $min_gnome_version)
  31 +  no_gnome=""
  32 +  if test "$GNOME_CONFIG" = "no" ; then
  33 +    no_gnome=yes
  34 +  else
  35 +    GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`"
  36 +    GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`"
  37 +    GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`"
  38 +    GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`"
  39 +
  40 +    gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \
  41 +           sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
  42 +    gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \
  43 +           sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
  44 +    gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \
  45 +           sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
  46 +    needed_major_version=`echo $min_gnome_version | \
  47 +           sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
  48 +    needed_minor_version=`echo $min_gnome_version | \
  49 +           sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
  50 +    needed_micro_version=`echo $min_gnome_version | \
  51 +           sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
  52 +
  53 +    if test $gnome_config_major_version -lt $needed_major_version; then
  54 +       ifelse([$3], , :, [$3])
  55 +       no_gnome=yes
  56 +    elif test $gnome_config_major_version = $needed_major_version; then
  57 +       if test -n "$needed_minor_version" -a $gnome_config_minor_version -lt $needed_minor_version; then
  58 +               ifelse([$3], , :, [$3])
  59 +               no_gnome=yes
  60 +       elif test -n "$needed_minor_version" -a $gnome_config_minor_version = $needed_minor_version; then
  61 +               if test -n "$needed_micro_version" -a $gnome_config_micro_version -lt $needed_micro_version; then
  62 +                       ifelse([$3], , :, [$3])
  63 +                       no_gnome=yes
  64 +               fi
  65 +       fi
  66 +    fi
  67 +  fi
  68 +  AC_SUBST(GNOME_CFLAGS)
  69 +  AC_SUBST(GNOME_LIBS)
  70 +  AC_SUBST(GNOMEUI_CFLAGS)
  71 +  AC_SUBST(GNOMEUI_LIBS)
  72 +
  73 +  if test "x$no_gnome" = x ; then
  74 +     AC_MSG_RESULT(yes)
  75 +     ifelse([$2], , :, [$2])
  76 +  else
  77 +     AC_MSG_RESULT(no)
  78 +     if test "$GNOME_CONFIG" = "no" ; then
  79 +       echo "*** The gnome-config script installed by GNOME could not be found"
  80 +       echo "*** If GNOME was installed in PREFIX, make sure PREFIX/bin is in"
  81 +       echo "*** your path, or set the GNOME_CONFIG environment variable to the"
  82 +       echo "*** full path to gnome-config."
  83 +     else
  84 +       :
  85 +     fi
  86 +     GNOME_CFLAGS=""
  87 +     GNOME_LIBS=""
  88 +     ifelse([$3], , :, [$3])
  89 +  fi
  90 +
  91 +  tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir`
  92 +  if test -n "$4"; then
  93 +       AC_MSG_CHECKING([for additional GNOME modules])
  94 +  fi
  95 +  for module in $4 ""; do
  96 +       gnome_m4_notfound=no
  97 +       if test "$module" = zvt; then
  98 +         ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`"
  99 +         AC_SUBST(ZVT_LIBS)
 100 +       elif test "$module" = gtk; then
 101 +         GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`"
 102 +         GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`"
 103 +         AC_SUBST(GTK_CFLAGS)
 104 +         AC_SUBST(GTK_LIBS)
 105 +       elif test "$module" = "glib"; then
 106 +         GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`"
 107 +         GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`"
 108 +         AC_SUBST(GLIB_CFLAGS)
 109 +         AC_SUBST(GLIB_LIBS)
 110 +       elif test "$module" = "oaf"; then
 111 +         OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`"
 112 +         OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`"
 113 +         AC_SUBST(OAF_CFLAGS)
 114 +         AC_SUBST(OAF_LIBS)
 115 +       elif test "$module" = "gnorba"; then
 116 +         GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`"
 117 +         GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`"
 118 +         AC_SUBST(GNORBA_CFLAGS)
 119 +         AC_SUBST(GNORBA_LIBS)
 120 +       elif test -n "$module"; then
 121 +         if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then
 122 +               tmp_bsnom=`echo $module | tr a-z A-Z`
 123 +               eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\"
 124 +               eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\"
 125 +         else
 126 +               AC_MSG_RESULT([*** $module library is not installed])
 127 +               ifelse([$3], , :, [$3])
 128 +               gnome_m4_notfound=yes
 129 +         fi
 130 +       fi
 131 +       if test "$gnome_m4_notfound" = no; then
 132 +         echo $ac_n " $module" 1>&6
 133 +       fi
 134 +  done
 135 +  if test -n "$4"; then
 136 +       AC_MSG_RESULT([])
 137 +  fi
 138 +])
 139 +