Added skeleton for libnetcdf.settings. See JIRA ticket at https://bugtracking.unidata.ucar.edu/browse/NCF-303

This commit is contained in:
Ward Fisher 2014-05-30 13:36:35 -06:00
parent 3ac11849af
commit 6c0e34f89a
4 changed files with 63 additions and 6 deletions

30
.gitignore vendored
View File

@ -1,3 +1,33 @@
### The following block of files should be removed
### from .gitignore when this branch is merged back in to
### master.
/Makefile
Makefile.in
/aclocal.m4
/autom4te.cache
/config.*
/configure
/depcomp
/install-sh
/libtool
/ltmain.sh
/m4/
/missing
/stamp-h?
.deps/
.dirstamp
.libs/
*.l[ao]
*~
VERSION
compile
comps.txt
libnetcdf.settings
nc-config
netcdf.pc
test-driver
### 'Normal' gitignore files.
debug.txt debug.txt
CTestConfig.cmake CTestConfig.cmake
Vagrantfile Vagrantfile

View File

@ -10,12 +10,12 @@ ACLOCAL_AMFLAGS = -I m4
# These files get added to the distribution. # These files get added to the distribution.
EXTRA_DIST = README.md COPYRIGHT INSTALL INSTALL.cmake test_prog.c \ EXTRA_DIST = README.md COPYRIGHT INSTALL INSTALL.cmake test_prog.c \
lib_flags.am cmake CMakeLists.txt COMPILE.cmake.txt config.h.cmake.in \ lib_flags.am cmake CMakeLists.txt COMPILE.cmake.txt \
config.h.cmake.in cmake_uninstall.cmake.in \ config.h.cmake.in cmake_uninstall.cmake.in \
netcdf-config-version.cmake.in \ netcdf-config-version.cmake.in \
netcdf-config.cmake.in FixBundle.cmake.in \ netcdf-config.cmake.in FixBundle.cmake.in \
nc-config.cmake.in RELEASE_NOTES.md CTestCustom.cmake \ nc-config.cmake.in RELEASE_NOTES.md CTestCustom.cmake \
CTestConfig.cmake.in CTestConfig.cmake.in libnetcdf.settings
# Doxygen doesn't build nicely in vpath builds. # Doxygen doesn't build nicely in vpath builds.
# Don't do this; it wipes out any exported values # Don't do this; it wipes out any exported values

View File

@ -17,9 +17,15 @@ AC_PREREQ([2.59])
# Initialize with name, version, and support email address. # Initialize with name, version, and support email address.
AC_INIT([netCDF], [4.3.3-rc1], [support-netcdf@unidata.ucar.edu]) AC_INIT([netCDF], [4.3.3-rc1], [support-netcdf@unidata.ucar.edu])
#####
# Set some variables used to generate a libnetcdf.settings file,
# pattered after the files generated by libhdf4, libhdf5.
#####
# Create the VERSION file, which contains the package version from # Create the VERSION file, which contains the package version from
# AC_INIT. # AC_INIT.
echo -n AC_PACKAGE_VERSION>VERSION echo AC_PACKAGE_VERSION>VERSION
AC_SUBST(PACKAGE_VERSION) AC_SUBST(PACKAGE_VERSION)
AC_MSG_NOTICE([netCDF AC_PACKAGE_VERSION]) AC_MSG_NOTICE([netCDF AC_PACKAGE_VERSION])
@ -27,6 +33,9 @@ AC_MSG_NOTICE([netCDF AC_PACKAGE_VERSION])
# Keep libtool macros in an m4 directory. # Keep libtool macros in an m4 directory.
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
# Configuration Date
AC_SUBST([CONFIG_DATE]) CONFIG_DATE="`date`"
# Find out about the host we're building on. # Find out about the host we're building on.
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -627,9 +636,9 @@ fi
if test "x$enable_doxygen" != xno; then if test "x$enable_doxygen" != xno; then
if test -n "$DOXYGEN"; then if test -n "$DOXYGEN"; then
AC_SUBST(HAVE_DOT) AC_SUBST(HAVE_DOT)
AC_CONFIG_FILES([docs/Doxyfile]) AC_CONFIG_FILES([docs/Doxyfile
AC_CONFIG_FILES([docs/Doxyfile.guide]) docs/Doxyfile.guide
AC_CONFIG_FILES([docs/Doxyfile.tutorial]) docs/Doxyfile.tutorial])
fi fi
# Note: the list of files to input to doxygen # Note: the list of files to input to doxygen
# has been moved to docs/Doxyfile.in so # has been moved to docs/Doxyfile.in so
@ -1001,6 +1010,7 @@ AC_MSG_NOTICE([generating header files and makefiles])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
nc-config nc-config
netcdf.pc netcdf.pc
libnetcdf.settings
include/Makefile include/Makefile
h5_test/Makefile h5_test/Makefile
docs/Makefile docs/Makefile

17
libnetcdf.settings.in Normal file
View File

@ -0,0 +1,17 @@
NetCDF Configuration Summary
============================
General
-------
NetCDF Version: @PACKAGE_VERSION@
Configured On: @CONFIG_DATE@
Host System: @host_cpu@-@host_vendor@-@host_os@
Compiling Options
-----------------
Features:
---------