Forráskód Böngészése

configure: add bzip2 support

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67214 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 9 éve
szülő
commit
b9996177f8
5 módosított fájl, 966 hozzáadás és 657 törlés
  1. 920 656
      configure
  2. 37 0
      configure.in
  3. 1 1
      include/Make/Grass.make
  4. 5 0
      include/Make/Platform.make.in
  5. 3 0
      include/config.h.in

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 920 - 656
configure


+ 37 - 0
configure.in

@@ -265,6 +265,7 @@ LOC_ARG_WITH(regex, regex)
 LOC_ARG_WITH(pthread, POSIX threads, no)
 LOC_ARG_WITH(openmp, OpenMP, no)
 LOC_ARG_WITH(opencl, OpenCL, no)
+LOC_ARG_WITH(bzlib, BZIP2, no)
 
 AC_ARG_WITH(gdal,
 [  --with-gdal[=path/gdal-config]
@@ -300,6 +301,9 @@ AC_ARG_WITH(libs,
 LOC_ARG_WITH_INC(zlib, zlib)
 LOC_ARG_WITH_LIB(zlib, zlib)
 
+LOC_ARG_WITH_INC(bzlib, BZIP2)
+LOC_ARG_WITH_LIB(bzlib, BZIP2)
+
 LOC_ARG_WITH_INC(readline, Readline)
 LOC_ARG_WITH_LIB(readline, Readline)
 
@@ -580,6 +584,38 @@ AC_SUBST(ZLIB)
 
 # Done checking zlib
 
+# bzip2 support
+
+LOC_CHECK_USE(bzlib,bzlib,USE_BZIP2)
+
+if test -n "$USE_BZIP2"; then
+
+BZLIBLIBPATH=
+BZLIBINCPATH=
+BZLIB=
+
+# With bzip2 includes directory
+
+LOC_CHECK_INC_PATH(bzlib,bzlib,BZLIBINCPATH)
+
+LOC_CHECK_INCLUDES(bzlib.h,bzlib,$BZLIBINCPATH)
+
+# With bzip2 library directory
+
+LOC_CHECK_LIB_PATH(bzlib,bzlib,BZLIBLIBPATH)
+
+LOC_CHECK_LIBS(bz2,BZ2_bzBuffToBuffCompress,bzlib,$BZLIBLIBPATH,BZLIB,,,)
+
+#
+
+fi # $USE_BZIP2
+
+AC_SUBST(BZLIBINCPATH)
+AC_SUBST(BZLIBLIBPATH)
+AC_SUBST(BZLIB)
+
+# Done checking bzip2
+
 # Mandatory PROJ dependency
 
 PROJINC=
@@ -1795,6 +1831,7 @@ LOC_MSG([  MacOSX architectures:       ${MACOSX_ARCHS}])
 LOC_MSG([  MacOSX SDK:                 ${MACOSX_SDK}])
 LOC_MSG()
 LOC_MSG_USE(BLAS support,USE_BLAS)
+LOC_MSG_USE(BZIP2 support,USE_BZIP2)
 LOC_MSG_USE(C++ support,USE_CXX)
 LOC_MSG_USE(Cairo support,USE_CAIRO)
 LOC_MSG_USE(DWG support,USE_OPENDWG)

+ 1 - 1
include/Make/Grass.make

@@ -195,7 +195,7 @@ DRIVERDEPS       = $(GISLIB) $(FTLIB) $(ICONVLIB) $(MATHLIB)
 DSPFDEPS         = $(GISLIB)
 FORMDEPS         = $(DBMILIB) $(GISLIB)
 RASTER3DDEPS     = $(RASTERLIB) $(GISLIB)
-GISDEPS          = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
+GISDEPS          = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(BZLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
 GMATHDEPS        = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OMPLIBPATH) $(OMPLIB)
 GPDEDEPS         = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(OMPLIBPATH) $(OMPLIB) $(MATHLIB)
 GPROJDEPS        = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)

+ 5 - 0
include/Make/Platform.make.in

@@ -94,6 +94,11 @@ ZLIB                = @ZLIB@
 ZLIBINCPATH         = @ZLIBINCPATH@
 ZLIBLIBPATH         = @ZLIBLIBPATH@
 
+#BZIP2:
+BZLIB                = @BZLIB@
+BZLIBINCPATH         = @BZLIBINCPATH@
+BZLIBLIBPATH         = @BZLIBLIBPATH@
+
 DBMIEXTRALIB        = @DBMIEXTRALIB@
 
 #readline

+ 3 - 0
include/config.h.in

@@ -38,6 +38,9 @@
 /* define if zlib.h exists */
 #undef HAVE_ZLIB_H
 
+/* define if bzlib.h exists */
+#undef HAVE_BZLIB_H
+
 /* define if sys/ioctl.h exists */
 #undef HAVE_SYS_IOCTL_H