Ticket #37490: patch-configure.ac.diff

File patch-configure.ac.diff, 950 bytes (added by jdgleeson, 11 years ago)

  • configure.ac

    old new  
    4141AC_SUBST([XTRA_LDFLAGS])
    4242
    4343AC_PROG_CC
    44 AM_PROG_CC_STDC
    4544AC_PROG_INSTALL
    4645AC_PROG_LIBTOOL
    4746AC_PROG_LN_S
    … …  
    350349# authors decide to do this AGAIN. Which I really hope they won't. TBB
    351350
    352351if test "$withval" != no; then
    353   AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
    354352  AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
    355   if test -n "$LIBPNG12_CONFIG"; then
    356     libpng_CPPFLAGS=`libpng12-config --cflags`
    357     # should be --ldopts, but it's currently broken
    358     libpng_LDFLAGS=`libpng12-config --ldflags`
    359     libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
    360   elif test -n "$LIBPNG_CONFIG"; then
     353  if test -n "$LIBPNG_CONFIG"; then
    361354    libpng_CPPFLAGS=`libpng-config --cflags`
    362355    # should be --ldopts, but it's currently broken
    363356    libpng_LDFLAGS=`libpng-config --ldflags`