Magellan Linux

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

    Contents of /trunk/smpeg/patches/smpeg-0.4.4-cflags.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 4576 byte(s) 
    -import
    1 Index: smpeg-0.4.4/configure.in
    2 ===================================================================
    3 --- smpeg-0.4.4.orig/configure.in
    4 +++ smpeg-0.4.4/configure.in
    5 @@ -60,7 +60,7 @@ dnl The alpha architecture needs special
    6 case "$target" in
    7 alpha*-*-linux*)
    8 if test x$ac_cv_prog_gcc = xyes; then
    9 - CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall"
    10 + EXTRA_CFLAGS="$EXTRA_CFLAGS -mcpu=ev4 -Wa,-mall"
    11 fi
    12 ;;
    13 sparc*-*-solaris*)
    14 @@ -102,17 +102,17 @@ AC_ARG_ENABLE(debug,
    15 , enable_debug=yes)
    16 if test x$enable_debug != xyes; then
    17 if test x$ac_cv_prog_gcc = xyes; then
    18 - CFLAGS="$CFLAGS -fexpensive-optimizations -fomit-frame-pointer"
    19 + EXTRA_CFLAGS="$EXTRA_CFLAGS -fexpensive-optimizations -fomit-frame-pointer"
    20 fi
    21 case "$target" in
    22 i486-*-*) # Yeah right. :)
    23 if test x$ac_cv_prog_gcc = xyes; then
    24 - CFLAGS="$CFLAGS -march=486"
    25 + EXTRA_CFLAGS="$EXTRA_CFLAGS -march=486"
    26 fi
    27 ;;
    28 i?86-*-*)
    29 if test x$ac_cv_prog_gcc = xyes; then
    30 - CFLAGS="$CFLAGS -march=pentium -mcpu=pentiumpro"
    31 + EXTRA_CFLAGS="$EXTRA_CFLAGS -march=pentium -mcpu=pentiumpro"
    32 fi
    33 ;;
    34 esac
    35 @@ -124,7 +124,7 @@ AM_PATH_SDL($SDL_VERSION,
    36 :,
    37 AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
    38 )
    39 -CFLAGS="$CFLAGS $SDL_CFLAGS"
    40 +EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS"
    41 LIBS="$LIBS $SDL_LIBS"
    42
    43 dnl See if we need to pass -lm for the math library
    44 @@ -145,7 +145,7 @@ if test x$enable_mmx = xyes; then
    45 AC_MSG_RESULT($use_mmx)
    46
    47 if test x$use_mmx = xyes; then
    48 - CFLAGS="$CFLAGS -DUSE_MMX"
    49 + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_MMX"
    50 fi
    51 fi
    52
    53 @@ -162,7 +162,7 @@ if test x$enable_ati = xyes; then
    54 AC_MSG_RESULT($use_ati)
    55
    56 if test x$use_ati = xyes; then
    57 - CFLAGS="$CFLAGS -DUSE_ATI"
    58 + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_ATI"
    59 fi
    60 fi
    61
    62 @@ -171,7 +171,7 @@ AC_ARG_ENABLE(timestamp-sync,
    63 [ --enable-timestamp-sync enable system timestamp sync [default=yes]],
    64 , enable_timestamp_sync=no)
    65 if test x$enable_timestamp_sync = xyes; then
    66 - CFLAGS="$CFLAGS -DUSE_TIMESTAMP_SYNC"
    67 +EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMESTAMP_SYNC"
    68 fi
    69
    70 dnl Enable the use of the system thread
    71 @@ -179,7 +179,7 @@ AC_ARG_ENABLE(threaded-system,
    72 [ --enable-threaded-system enable system thread [default=no]],
    73 , enable_threaded_system=no)
    74 if test x$enable_threaded_system = xyes; then
    75 - CFLAGS="$CFLAGS -DUSE_SYSTEM_THREAD"
    76 +EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_SYSTEM_THREAD"
    77 fi
    78
    79 dnl Enable threaded audio
    80 @@ -187,7 +187,7 @@ AC_ARG_ENABLE(threaded-audio,
    81 [ --enable-threaded-audio enable threaded audio [default=yes]],
    82 , enable_threaded_audio=yes)
    83 if test x$enable_threaded_audio = xyes; then
    84 - CFLAGS="$CFLAGS -DTHREADED_AUDIO"
    85 +EXTRA_CFLAGS="$EXTRA_CFLAGS -DTHREADED_AUDIO"
    86 fi
    87
    88 dnl See if we can build the GTk player
    89 @@ -198,7 +198,7 @@ have_gtk=no
    90 if test x$enable_gtk_player = xyes; then
    91 AM_PATH_GTK(1.2.1, have_gtk=yes)
    92 if test x$have_gtk = xyes; then
    93 - CFLAGS="$CFLAGS $GTK_CFLAGS"
    94 + EXTRA_CFLAGS="$EXTRA_CFLAGS $GTK_CFLAGS"
    95 fi
    96 AC_SUBST(GTK_LIBS)
    97 fi
    98 @@ -224,7 +224,7 @@ if test x$enable_opengl_player = xyes; t
    99 AC_PATH_X
    100 AC_PATH_XTRA
    101 if test x$have_x = xyes; then
    102 - CFLAGS="$CFLAGS $X_CFLAGS"
    103 + EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
    104 SYS_GL_LIBS="$X_LIBS -lGL -lGLU"
    105 else
    106 SYS_GL_LIBS="-lGL -lGLU"
    107 @@ -255,17 +255,16 @@ AC_ARG_ENABLE(assertions,
    108 [ --enable-assertions Enable consistency checks in decoding [default=no]],
    109 , enable_assertions=no)
    110 if test x$enable_assertions != xyes; then
    111 - CFLAGS="$CFLAGS -DNDEBUG"
    112 + EXTRA_CFLAGS="$EXTRA_CFLAGS -DNDEBUG"
    113 fi
    114
    115 dnl Add the source include directories
    116 -CFLAGS="$CFLAGS -I.. -DNOCONTROLS"
    117 -CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/audio -I\$(top_srcdir)/video"
    118 -CXXFLAGS="$CFLAGS"
    119 -
    120 +EXTRA_CFLAGS="$EXTRA_CFLAGS -I.. -DNOCONTROLS"
    121 +EXTRA_CFLAGS="$EXTRA_CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/audio -I\$(top_srcdir)/video"
    122 +CXXFLAGS="$EXTRA_CFLAGS $CXXFLAGS"
    123 +CFLAGS="$EXTRA_CFLAGS $CFLAGS"
    124
    125 dnl C++ flags are the same as the C flags
    126 -CXXFLAGS="$CFLAGS"
    127 if test x$GCC = xyes; then
    128 # Check to see if options -fno-rtti -fno-exceptions are supported
    129 AC_MSG_CHECKING(if $CXX supports -fno-rtti -fno-exceptions)