efl-m4.patch

   1 diff -Nur empty/ac_expand_dir.m4 m4/ac_expand_dir.m4
   2 --- /dev/null   1970-01-01 01:00:00.000000000 +0100
   3 +++ efl/m4/ac_expand_dir.m4     2004-06-24 08:11:31.000000000 +0200
   4 @@ -0,0 +1,14 @@
   5 +dnl AC_EXPAND_DIR(VARNAME, DIR)
   6 +dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
   7 +dnl and assigns the resulting string to VARNAME
   8 +dnl example: AC_DEFINE_DIR(DATADIR, "$datadir")
   9 +dnl by Alexandre Oliva <oliva@dcc.unicamp.br>
  10 +AC_DEFUN([AC_EXPAND_DIR], [
  11 +       $1=$2
  12 +       $1=`(
  13 +           test "x$prefix" = xNONE && prefix="$ac_default_prefix"
  14 +           test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
  15 +           eval echo \""[$]$1"\"
  16 +           )`
  17 +])
  18 +
  19 diff -Nur empty/ac_path_generic.m4 m4/ac_path_generic.m4
  20 --- /dev/null   1970-01-01 01:00:00.000000000 +0100
  21 +++ efl/m4/ac_path_generic.m4   2005-10-30 01:27:22.000000000 +0200
  22 @@ -0,0 +1,138 @@
  23 +dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
  24 +dnl
  25 +dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS
  26 +dnl
  27 +dnl The script must support `--cflags' and `--libs' args.
  28 +dnl If MINIMUM-VERSION is specified, the script must also support the
  29 +dnl `--version' arg.
  30 +dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given,
  31 +dnl it must also support `--prefix' and `--exec-prefix'.
  32 +dnl (In other words, it must be like gtk-config.)
  33 +dnl
  34 +dnl For example:
  35 +dnl
  36 +dnl    AC_PATH_GENERIC(Foo, 1.0.0)
  37 +dnl
  38 +dnl would run `foo-config --version' and check that it is at least 1.0.0
  39 +dnl
  40 +dnl If so, the following would then be defined:
  41 +dnl
  42 +dnl    FOO_CFLAGS to `foo-config --cflags`
  43 +dnl    FOO_LIBS   to `foo-config --libs`
  44 +dnl
  45 +dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
  46 +dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
  47 +dnl
  48 +dnl @author Angus Lees <gusl@cse.unsw.edu.au>
  49 +
  50 +AC_DEFUN([AC_PATH_GENERIC],
  51 +[dnl
  52 +dnl we're going to need uppercase, lowercase and user-friendly versions of the
  53 +dnl string `LIBRARY'
  54 +pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
  55 +pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
  56 +
  57 +dnl
  58 +dnl Get the cflags and libraries from the LIBRARY-config script
  59 +dnl
  60 +AC_ARG_WITH(DOWN-prefix,
  61 +        [  --with-]DOWN[-prefix=PFX       Prefix where $1 is installed (optional)],
  62 +        DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="")
  63 +AC_ARG_WITH(DOWN-exec-prefix,
  64 +        [  --with-]DOWN[-exec-prefix=PFX  Exec prefix where $1 is installed (optional)],
  65 +        DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="")
  66 +
  67 +  if test x$DOWN[]_config_exec_prefix != x ; then
  68 +     DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix"
  69 +     if test x${UP[]_CONFIG+set} != xset ; then
  70 +       UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config
  71 +     fi
  72 +  fi
  73 +  if test x$DOWN[]_config_prefix != x ; then
  74 +     DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix"
  75 +     if test x${UP[]_CONFIG+set} != xset ; then
  76 +       UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config
  77 +     fi
  78 +  fi
  79 +
  80 +  AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no)
  81 +  ifelse([$2], ,
  82 +     AC_MSG_CHECKING(for $1),
  83 +     AC_MSG_CHECKING(for $1 - version >= $2)
  84 +  )
  85 +  no_[]DOWN=""
  86 +  if test "$UP[]_CONFIG" = "no" ; then
  87 +     no_[]DOWN=yes
  88 +  else
  89 +     UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`"
  90 +     UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`"
  91 +     ifelse([$2], , ,[
  92 +        DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \
  93 +         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
  94 +        DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \
  95 +         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
  96 +        DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \
  97 +         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
  98 +        DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])"
  99 +        DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])"
 100 +        DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])"
 101 +
 102 +        # Compare wanted version to what config script returned.
 103 +        # If I knew what library was being run, i'd probably also compile
 104 +        # a test program at this point (which also extracted and tested
 105 +        # the version in some library-specific way)
 106 +        if test "$DOWN[]_config_major_version" -lt \
 107 +                        "$DOWN[]_wanted_major_version" \
 108 +          -o \( "$DOWN[]_config_major_version" -eq \
 109 +                        "$DOWN[]_wanted_major_version" \
 110 +            -a "$DOWN[]_config_minor_version" -lt \
 111 +                        "$DOWN[]_wanted_minor_version" \) \
 112 +          -o \( "$DOWN[]_config_major_version" -eq \
 113 +                        "$DOWN[]_wanted_major_version" \
 114 +            -a "$DOWN[]_config_minor_version" -eq \
 115 +                        "$DOWN[]_wanted_minor_version" \
 116 +            -a "$DOWN[]_config_micro_version" -lt \
 117 +                        "$DOWN[]_wanted_micro_version" \) ; then
 118 +          # older version found
 119 +          no_[]DOWN=yes
 120 +          echo -n "*** An old version of $1 "
 121 +          echo -n "($DOWN[]_config_major_version"
 122 +          echo -n ".$DOWN[]_config_minor_version"
 123 +          echo    ".$DOWN[]_config_micro_version) was found."
 124 +          echo -n "*** You need a version of $1 newer than "
 125 +          echo -n "$DOWN[]_wanted_major_version"
 126 +          echo -n ".$DOWN[]_wanted_minor_version"
 127 +          echo    ".$DOWN[]_wanted_micro_version."
 128 +          echo "***"
 129 +          echo "*** If you have already installed a sufficiently new version, this error"
 130 +          echo "*** probably means that the wrong copy of the DOWN-config shell script is"
 131 +          echo "*** being found. The easiest way to fix this is to remove the old version"
 132 +          echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the"
 133 +          echo "*** correct copy of DOWN-config. (In this case, you will have to"
 134 +          echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
 135 +          echo "*** so that the correct libraries are found at run-time)"
 136 +        fi
 137 +     ])
 138 +  fi
 139 +  if test "x$no_[]DOWN" = x ; then
 140 +     AC_MSG_RESULT(yes)
 141 +     ifelse([$3], , :, [$3])
 142 +  else
 143 +     AC_MSG_RESULT(no)
 144 +     if test "$UP[]_CONFIG" = "no" ; then
 145 +       echo "*** The DOWN-config script installed by $1 could not be found"
 146 +       echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in"
 147 +       echo "*** your path, or set the UP[]_CONFIG environment variable to the"
 148 +       echo "*** full path to DOWN-config."
 149 +     fi
 150 +     UP[]_CFLAGS=""
 151 +     UP[]_LIBS=""
 152 +     ifelse([$4], , :, [$4])
 153 +  fi
 154 +  AC_SUBST(UP[]_CFLAGS)
 155 +  AC_SUBST(UP[]_LIBS)
 156 +
 157 +  popdef([UP])
 158 +  popdef([DOWN])
 159 +])
 160 +