Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/smpeg/patches/smpeg-0.4.4-gtk-m4.patch

    Annotation of /trunk/smpeg/patches/smpeg-0.4.4-gtk-m4.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
    File size: 18300 byte(s) 
    -import
    1 niro 153 Index: smpeg-0.4.4/m4/glib.m4
    2     ===================================================================
    3     --- /dev/null
    4     +++ smpeg-0.4.4/m4/glib.m4
    5     @@ -0,0 +1,196 @@
    6     +# Configure paths for GLIB
    7     +# Owen Taylor 97-11-3
    8     +
    9     +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
    10     +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
    11     +dnl gthread is specified in MODULES, pass to glib-config
    12     +dnl
    13     +AC_DEFUN([AM_PATH_GLIB],
    14     +[dnl
    15     +dnl Get the cflags and libraries from the glib-config script
    16     +dnl
    17     +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
    18     + glib_config_prefix="$withval", glib_config_prefix="")
    19     +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
    20     + glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
    21     +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
    22     + , enable_glibtest=yes)
    23     +
    24     + if test x$glib_config_exec_prefix != x ; then
    25     + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
    26     + if test x${GLIB_CONFIG+set} != xset ; then
    27     + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
    28     + fi
    29     + fi
    30     + if test x$glib_config_prefix != x ; then
    31     + glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
    32     + if test x${GLIB_CONFIG+set} != xset ; then
    33     + GLIB_CONFIG=$glib_config_prefix/bin/glib-config
    34     + fi
    35     + fi
    36     +
    37     + for module in . $4
    38     + do
    39     + case "$module" in
    40     + gmodule)
    41     + glib_config_args="$glib_config_args gmodule"
    42     + ;;
    43     + gthread)
    44     + glib_config_args="$glib_config_args gthread"
    45     + ;;
    46     + esac
    47     + done
    48     +
    49     + AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
    50     + min_glib_version=ifelse([$1], ,0.99.7,$1)
    51     + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
    52     + no_glib=""
    53     + if test "$GLIB_CONFIG" = "no" ; then
    54     + no_glib=yes
    55     + else
    56     + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
    57     + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
    58     + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
    59     + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    60     + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
    61     + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    62     + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
    63     + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    64     + if test "x$enable_glibtest" = "xyes" ; then
    65     + ac_save_CFLAGS="$CFLAGS"
    66     + ac_save_LIBS="$LIBS"
    67     + CFLAGS="$CFLAGS $GLIB_CFLAGS"
    68     + LIBS="$GLIB_LIBS $LIBS"
    69     +dnl
    70     +dnl Now check if the installed GLIB is sufficiently new. (Also sanity
    71     +dnl checks the results of glib-config to some extent
    72     +dnl
    73     + rm -f conf.glibtest
    74     + AC_TRY_RUN([
    75     +#include <glib.h>
    76     +#include <stdio.h>
    77     +#include <stdlib.h>
    78     +
    79     +int
    80     +main ()
    81     +{
    82     + int major, minor, micro;
    83     + char *tmp_version;
    84     +
    85     + system ("touch conf.glibtest");
    86     +
    87     + /* HP/UX 9 (%@#!) writes to sscanf strings */
    88     + tmp_version = g_strdup("$min_glib_version");
    89     + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
    90     + printf("%s, bad version string\n", "$min_glib_version");
    91     + exit(1);
    92     + }
    93     +
    94     + if ((glib_major_version != $glib_config_major_version) ||
    95     + (glib_minor_version != $glib_config_minor_version) ||
    96     + (glib_micro_version != $glib_config_micro_version))
    97     + {
    98     + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
    99     + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
    100     + glib_major_version, glib_minor_version, glib_micro_version);
    101     + printf ("*** was found! If glib-config was correct, then it is best\n");
    102     + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
    103     + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
    104     + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
    105     + printf("*** required on your system.\n");
    106     + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
    107     + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
    108     + printf("*** before re-running configure\n");
    109     + }
    110     + else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
    111     + (glib_minor_version != GLIB_MINOR_VERSION) ||
    112     + (glib_micro_version != GLIB_MICRO_VERSION))
    113     + {
    114     + printf("*** GLIB header files (version %d.%d.%d) do not match\n",
    115     + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
    116     + printf("*** library (version %d.%d.%d)\n",
    117     + glib_major_version, glib_minor_version, glib_micro_version);
    118     + }
    119     + else
    120     + {
    121     + if ((glib_major_version > major) ||
    122     + ((glib_major_version == major) && (glib_minor_version > minor)) ||
    123     + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
    124     + {
    125     + return 0;
    126     + }
    127     + else
    128     + {
    129     + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
    130     + glib_major_version, glib_minor_version, glib_micro_version);
    131     + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
    132     + major, minor, micro);
    133     + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
    134     + printf("***\n");
    135     + printf("*** If you have already installed a sufficiently new version, this error\n");
    136     + printf("*** probably means that the wrong copy of the glib-config shell script is\n");
    137     + printf("*** being found. The easiest way to fix this is to remove the old version\n");
    138     + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
    139     + printf("*** correct copy of glib-config. (In this case, you will have to\n");
    140     + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
    141     + printf("*** so that the correct libraries are found at run-time))\n");
    142     + }
    143     + }
    144     + return 1;
    145     +}
    146     +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
    147     + CFLAGS="$ac_save_CFLAGS"
    148     + LIBS="$ac_save_LIBS"
    149     + fi
    150     + fi
    151     + if test "x$no_glib" = x ; then
    152     + AC_MSG_RESULT(yes)
    153     + ifelse([$2], , :, [$2])
    154     + else
    155     + AC_MSG_RESULT(no)
    156     + if test "$GLIB_CONFIG" = "no" ; then
    157     + echo "*** The glib-config script installed by GLIB could not be found"
    158     + echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
    159     + echo "*** your path, or set the GLIB_CONFIG environment variable to the"
    160     + echo "*** full path to glib-config."
    161     + else
    162     + if test -f conf.glibtest ; then
    163     + :
    164     + else
    165     + echo "*** Could not run GLIB test program, checking why..."
    166     + CFLAGS="$CFLAGS $GLIB_CFLAGS"
    167     + LIBS="$LIBS $GLIB_LIBS"
    168     + AC_TRY_LINK([
    169     +#include <glib.h>
    170     +#include <stdio.h>
    171     +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
    172     + [ echo "*** The test program compiled, but did not run. This usually means"
    173     + echo "*** that the run-time linker is not finding GLIB or finding the wrong"
    174     + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
    175     + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
    176     + echo "*** to the installed location Also, make sure you have run ldconfig if that"
    177     + echo "*** is required on your system"
    178     + echo "***"
    179     + echo "*** If you have an old version installed, it is best to remove it, although"
    180     + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
    181     + echo "***"
    182     + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
    183     + echo "*** came with the system with the command"
    184     + echo "***"
    185     + echo "*** rpm --erase --nodeps gtk gtk-devel" ],
    186     + [ echo "*** The test program failed to compile or link. See the file config.log for the"
    187     + echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
    188     + echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
    189     + echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
    190     + CFLAGS="$ac_save_CFLAGS"
    191     + LIBS="$ac_save_LIBS"
    192     + fi
    193     + fi
    194     + GLIB_CFLAGS=""
    195     + GLIB_LIBS=""
    196     + ifelse([$3], , :, [$3])
    197     + fi
    198     + AC_SUBST(GLIB_CFLAGS)
    199     + AC_SUBST(GLIB_LIBS)
    200     + rm -f conf.glibtest
    201     +])
    202     Index: smpeg-0.4.4/m4/gtk.m4
    203     ===================================================================
    204     --- /dev/null
    205     +++ smpeg-0.4.4/m4/gtk.m4
    206     @@ -0,0 +1,194 @@
    207     +# Configure paths for GTK+
    208     +# Owen Taylor 97-11-3
    209     +
    210     +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
    211     +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
    212     +dnl
    213     +AC_DEFUN([AM_PATH_GTK],
    214     +[dnl
    215     +dnl Get the cflags and libraries from the gtk-config script
    216     +dnl
    217     +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
    218     + gtk_config_prefix="$withval", gtk_config_prefix="")
    219     +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
    220     + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
    221     +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
    222     + , enable_gtktest=yes)
    223     +
    224     + for module in . $4
    225     + do
    226     + case "$module" in
    227     + gthread)
    228     + gtk_config_args="$gtk_config_args gthread"
    229     + ;;
    230     + esac
    231     + done
    232     +
    233     + if test x$gtk_config_exec_prefix != x ; then
    234     + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
    235     + if test x${GTK_CONFIG+set} != xset ; then
    236     + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
    237     + fi
    238     + fi
    239     + if test x$gtk_config_prefix != x ; then
    240     + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
    241     + if test x${GTK_CONFIG+set} != xset ; then
    242     + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
    243     + fi
    244     + fi
    245     +
    246     + AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
    247     + min_gtk_version=ifelse([$1], ,0.99.7,$1)
    248     + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
    249     + no_gtk=""
    250     + if test "$GTK_CONFIG" = "no" ; then
    251     + no_gtk=yes
    252     + else
    253     + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
    254     + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
    255     + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
    256     + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    257     + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
    258     + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    259     + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
    260     + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    261     + if test "x$enable_gtktest" = "xyes" ; then
    262     + ac_save_CFLAGS="$CFLAGS"
    263     + ac_save_LIBS="$LIBS"
    264     + CFLAGS="$CFLAGS $GTK_CFLAGS"
    265     + LIBS="$GTK_LIBS $LIBS"
    266     +dnl
    267     +dnl Now check if the installed GTK is sufficiently new. (Also sanity
    268     +dnl checks the results of gtk-config to some extent
    269     +dnl
    270     + rm -f conf.gtktest
    271     + AC_TRY_RUN([
    272     +#include <gtk/gtk.h>
    273     +#include <stdio.h>
    274     +#include <stdlib.h>
    275     +
    276     +int
    277     +main ()
    278     +{
    279     + int major, minor, micro;
    280     + char *tmp_version;
    281     +
    282     + system ("touch conf.gtktest");
    283     +
    284     + /* HP/UX 9 (%@#!) writes to sscanf strings */
    285     + tmp_version = g_strdup("$min_gtk_version");
    286     + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
    287     + printf("%s, bad version string\n", "$min_gtk_version");
    288     + exit(1);
    289     + }
    290     +
    291     + if ((gtk_major_version != $gtk_config_major_version) ||
    292     + (gtk_minor_version != $gtk_config_minor_version) ||
    293     + (gtk_micro_version != $gtk_config_micro_version))
    294     + {
    295     + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
    296     + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
    297     + gtk_major_version, gtk_minor_version, gtk_micro_version);
    298     + printf ("*** was found! If gtk-config was correct, then it is best\n");
    299     + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
    300     + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
    301     + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
    302     + printf("*** required on your system.\n");
    303     + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
    304     + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
    305     + printf("*** before re-running configure\n");
    306     + }
    307     +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
    308     + else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
    309     + (gtk_minor_version != GTK_MINOR_VERSION) ||
    310     + (gtk_micro_version != GTK_MICRO_VERSION))
    311     + {
    312     + printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
    313     + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
    314     + printf("*** library (version %d.%d.%d)\n",
    315     + gtk_major_version, gtk_minor_version, gtk_micro_version);
    316     + }
    317     +#endif /* defined (GTK_MAJOR_VERSION) ... */
    318     + else
    319     + {
    320     + if ((gtk_major_version > major) ||
    321     + ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
    322     + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
    323     + {
    324     + return 0;
    325     + }
    326     + else
    327     + {
    328     + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
    329     + gtk_major_version, gtk_minor_version, gtk_micro_version);
    330     + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
    331     + major, minor, micro);
    332     + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
    333     + printf("***\n");
    334     + printf("*** If you have already installed a sufficiently new version, this error\n");
    335     + printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
    336     + printf("*** being found. The easiest way to fix this is to remove the old version\n");
    337     + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
    338     + printf("*** correct copy of gtk-config. (In this case, you will have to\n");
    339     + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
    340     + printf("*** so that the correct libraries are found at run-time))\n");
    341     + }
    342     + }
    343     + return 1;
    344     +}
    345     +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
    346     + CFLAGS="$ac_save_CFLAGS"
    347     + LIBS="$ac_save_LIBS"
    348     + fi
    349     + fi
    350     + if test "x$no_gtk" = x ; then
    351     + AC_MSG_RESULT(yes)
    352     + ifelse([$2], , :, [$2])
    353     + else
    354     + AC_MSG_RESULT(no)
    355     + if test "$GTK_CONFIG" = "no" ; then
    356     + echo "*** The gtk-config script installed by GTK could not be found"
    357     + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
    358     + echo "*** your path, or set the GTK_CONFIG environment variable to the"
    359     + echo "*** full path to gtk-config."
    360     + else
    361     + if test -f conf.gtktest ; then
    362     + :
    363     + else
    364     + echo "*** Could not run GTK test program, checking why..."
    365     + CFLAGS="$CFLAGS $GTK_CFLAGS"
    366     + LIBS="$LIBS $GTK_LIBS"
    367     + AC_TRY_LINK([
    368     +#include <gtk/gtk.h>
    369     +#include <stdio.h>
    370     +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
    371     + [ echo "*** The test program compiled, but did not run. This usually means"
    372     + echo "*** that the run-time linker is not finding GTK or finding the wrong"
    373     + echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
    374     + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
    375     + echo "*** to the installed location Also, make sure you have run ldconfig if that"
    376     + echo "*** is required on your system"
    377     + echo "***"
    378     + echo "*** If you have an old version installed, it is best to remove it, although"
    379     + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
    380     + echo "***"
    381     + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
    382     + echo "*** came with the system with the command"
    383     + echo "***"
    384     + echo "*** rpm --erase --nodeps gtk gtk-devel" ],
    385     + [ echo "*** The test program failed to compile or link. See the file config.log for the"
    386     + echo "*** exact error that occured. This usually means GTK was incorrectly installed"
    387     + echo "*** or that you have moved GTK since it was installed. In the latter case, you"
    388     + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
    389     + CFLAGS="$ac_save_CFLAGS"
    390     + LIBS="$ac_save_LIBS"
    391     + fi
    392     + fi
    393     + GTK_CFLAGS=""
    394     + GTK_LIBS=""
    395     + ifelse([$3], , :, [$3])
    396     + fi
    397     + AC_SUBST(GTK_CFLAGS)
    398     + AC_SUBST(GTK_LIBS)
    399     + rm -f conf.gtktest
    400     +])
    401     Index: smpeg-0.4.4/m4/socklen.m4
    402     ===================================================================
    403     --- /dev/null
    404     +++ smpeg-0.4.4/m4/socklen.m4
    405     @@ -0,0 +1,23 @@
    406     +###################################################################
    407     +## To: autoconf@gnu.org
    408     +## Subject: socklen_t
    409     +## From: lars brinkhoff <lars@nocrew.org>
    410     +## Date: 26 Mar 1999 11:38:09 +0100
    411     +##
    412     +## Here's an attempt at a check for socklen_t. AC_CHECK_TYPE doesn't
    413     +## work because it doesn't search <sys/socket.h>. Maybe that macro
    414     +## should be changed instead.
    415     +##
    416     +AC_DEFUN(AC_TYPE_SOCKLEN_T,
    417     +[AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
    418     +[
    419     + AC_TRY_COMPILE(
    420     + [#include <sys/socket.h>],
    421     + [socklen_t len = 42; return len;],
    422     + ac_cv_type_socklen_t=yes,
    423     + ac_cv_type_socklen_t=no)
    424     +])
    425     + if test $ac_cv_type_socklen_t != yes; then
    426     + AC_DEFINE(socklen_t, int)
    427     + fi
    428     +])