[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [Public] / Amaya

Diff for /Amaya/configure.in between versions 1.104 and 1.105

version 1.104, 2003/01/13 09:50:42 version 1.105, 2003/01/30 07:40:34
Line 460  dnl  *********************************** Line 460  dnl  ***********************************
 echo "with gtk is ${with_gtk}, with gl is ${with_gl}\n"  echo "with gtk is ${with_gtk}, with gl is ${with_gl}\n"
   
 if test "${with_gtk}" != "yes" -o "${with_gl}" = "yes" ; then  if test "${with_gtk}" != "yes" -o "${with_gl}" = "yes" ; then
   AC_ARG_WITH(graphic-libs, [  --without-graphic-libs    doesn't use provided libjpeg, libpng.])    AC_ARG_WITH(graphic-libs, [  --with-graphic-libs    use static libjpeg, libpng.])
   if test "$withval" = "no" ; then    if test "$withval" = "no" ; then
     no_graphic=yes      no_graphic=yes
   fi    fi
Line 477  dnl Line 477  dnl
          x JPEG_LIB_VERSION x],           x JPEG_LIB_VERSION x],
 dnl  dnl
         AC_MSG_RESULT([yes])          AC_MSG_RESULT([yes])
           JPEGINCL=''
         LIBJPEG='-ljpeg'          LIBJPEG='-ljpeg'
         MAKEJPEG=['#'],          MAKEJPEG=['#'],
 dnl  dnl
         AC_MSG_RESULT([no])          AC_MSG_RESULT([no])
           JPEGINCL='-I$(THOTDIR)/libjpeg'
         LIBJPEG='../libjpeg.a'      dnl LIBJPEG goes into amaya/Makefile.in          LIBJPEG='../libjpeg.a'      dnl LIBJPEG goes into amaya/Makefile.in
         )          )
 dnl      dnl    
Line 491  dnl Line 493  dnl
         x PNG_LIBPNG_VER_STRING x],          x PNG_LIBPNG_VER_STRING x],
 dnl  dnl
         AC_MSG_RESULT([yes])          AC_MSG_RESULT([yes])
           PNGINCL=''
         LIBPNG='-lpng'          LIBPNG='-lpng'
         LIBZ=''          LIBZ=''
         MAKEPNG=['#'],          MAKEPNG=['#'],
 dnl  dnl
         AC_MSG_RESULT([no])          AC_MSG_RESULT([no])
           PNGINCL='-I$(THOTDIR)/libpng -I$(THOTDIR)/libpng/zlib'
         LIBPNG='../libpng.a'          LIBPNG='../libpng.a'
         LIBZ='../libz.a'          LIBZ='../libz.a'
         )          )
 else  else
       JPEGINCL='-I$(THOTDIR)/libjpeg'
     LIBJPEG='../libjpeg.a'      LIBJPEG='../libjpeg.a'
       PNGINCL='-I$(THOTDIR)/libpng -I$(THOTDIR)/libpng/zlib'
     LIBPNG='../libpng.a'      LIBPNG='../libpng.a'
     LIBZ='../libz.a'      LIBZ='../libz.a'
 fi  fi
Line 511  AC_SUBST(LIBZ) Line 517  AC_SUBST(LIBZ)
 AC_SUBST(MAKEJPEG)  AC_SUBST(MAKEJPEG)
 AC_SUBST(MAKEPNG)  AC_SUBST(MAKEPNG)
   
 AMAYA_VER="6.0"  AMAYA_VER="7.0"
   
 dnl  dnl
 dnl We use a special versoin of cextract patched for alignment  dnl We use a special versoin of cextract patched for alignment
Line 957  API="\$(THOTDIR)/thotlib/include" Line 963  API="\$(THOTDIR)/thotlib/include"
 VAR="\$(THOTDIR)/thotlib/internals/var"  VAR="\$(THOTDIR)/thotlib/internals/var"
 INCL="\$(THOTDIR)/thotlib/internals/h"  INCL="\$(THOTDIR)/thotlib/internals/h"
 FUNC="\$(THOTDIR)/thotlib/internals/f"  FUNC="\$(THOTDIR)/thotlib/internals/f"
 if test "${LIBPNG}" = "../libpng.a" ; then  
 #there is a modified header file we need  
 PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib"  
 fi  
 if test "${LIBJPEG}" = "../libjpeg.a" ; then  
 #there is a modified header file we need  
 JPEGINCL="-I\$(THOTDIR)/libjpeg"  
 fi  
   
 dnl  dnl
 dnl Set up the include variables.  dnl Set up the include variables.
Line 1152  if test "$no_motif" = yes ; then Line 1150  if test "$no_motif" = yes ; then
     echo "Amaya configured with GTK"      echo "Amaya configured with GTK"
     echo "Amaya configured without static graphic libraries (libjpeg, libpng)"      echo "Amaya configured without static graphic libraries (libjpeg, libpng)"
 else  else
 if test "$no_motif" = yes ; then    if test "$no_motif" = yes ; then
     echo "Amaya configured without static graphic libraries (libjpeg, libpng)"      echo "Amaya configured without static graphic libraries (libjpeg, libpng)"
 fi    else
 if test "$no_motif" = yes ; then      if test "$no_graphic" = "no"; then
         echo "Amaya configured with static graphic libraries (libjpeg, libpng)"
       fi
     fi
     if test "$no_motif" = yes ; then
     echo "Motif seems not installed on this machine"      echo "Motif seems not installed on this machine"
     echo "Amaya need Motif 1.2 or 2.0"      echo "Amaya need Motif 1.2 or 2.0"
 else    else
 if test "$motif_includes" = "" ; then      if test "$motif_includes" = "" ; then
     echo "Motif includes were not found"        echo "Motif includes were not found"
     echo "Amaya might not compile"        echo "Amaya might not compile"
     echo "Edit your Option file"        echo "Edit your Option file"
 else      else
 if test "$motif_libraries" = "" ; then        if test "$motif_libraries" = "" ; then
     echo "Motif libraries were not found"          echo "Motif libraries were not found"
     echo "Amaya might not compile"          echo "Amaya might not compile"
     echo "Edit your Option file"          echo "Edit your Option file"
 fi        fi
 fi      fi
 fi    fi
 fi  fi
   
 echo "Now type \"make\" (GNU make preferably) to build the binaries"  echo "Now type \"make\" (GNU make preferably) to build the binaries"
Removed from v.1.104  
changed lines
  Added in v.1.105

Webmaster