Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor cleanup #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Minor cleanup #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32abf82
Set automake to foreign mode.
QuLogic May 15, 2015
8bfa2ff
Remove netcdf option from configure.ac.
QuLogic May 15, 2015
8a2bea4
Ignore files that shouldn't be in git.
QuLogic May 15, 2015
3e3ff52
Fix warning about asprintf.
QuLogic May 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

# Configure stuff
autom4te.cache
config.h
config.log
config.status
stamp-h1

# Build stuff
Makefile
t/Makefile
*.o

# Executables
pssac2
12 changes: 0 additions & 12 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,6 @@ enable_option_checking
enable_maintainer_mode
enable_silent_rules
with_gmt
with_netcdf
enable_dependency_tracking
'
ac_precious_vars='build_alias
Expand Down Expand Up @@ -1337,7 +1336,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gmt=path Specify path to GMT
--with-netcdf=path Specify path to NetCDF

Some influential environment variables:
CC C compiler command
Expand Down Expand Up @@ -2628,15 +2626,6 @@ if test "${with_gmt+set}" = set; then :
fi


# Check whether --with-netcdf was given.
if test "${with_netcdf+set}" = set; then :
withval=$with_netcdf;
LDFLAGS+=" -L${withval}/lib "
CFLAGS+=" -I${withval}/include "

fi


ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Expand Down Expand Up @@ -3733,7 +3722,6 @@ if test "$ac_res" != no; then :

fi

#AC_SEARCH_LIBS(nc_create, netcdf, [], [AC_MSG_ERROR([NetCDF library not found])])

# Extract the first word of "gmt-config", so it can be a program name with args.
set dummy gmt-config; ac_word=$2
Expand Down
9 changes: 1 addition & 8 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,16 @@ AS_IF( [ test x"${CFLAGS}" = x ], [ CFLAGS="" ] )

AC_CONFIG_SRCDIR([./pss.c])

AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])

AC_ARG_WITH(gmt, [AS_HELP_STRING([--with-gmt=path],[Specify path to GMT])],
[
[ LDFLAGS+=" -L${withval}/lib "]
[ CFLAGS+=" -I${withval}/include " ]
], [])
AC_ARG_WITH(netcdf, [AS_HELP_STRING([--with-netcdf=path],
[Specify path to NetCDF])],
[
[ LDFLAGS+=" -L${withval}/lib " ]
[ CFLAGS+=" -I${withval}/include " ]
], [])

AC_PROG_CC
AC_SEARCH_LIBS(sin, m)
#AC_SEARCH_LIBS(nc_create, netcdf, [], [AC_MSG_ERROR([NetCDF library not found])])

AC_CHECK_PROG([GMTCONFIG], [gmt-config], [gmt-config])
test -z "$GMTCONFIG" && AC_MSG_ERROR([Missing GMT5 nstallation.])
Expand Down
1 change: 1 addition & 0 deletions pss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down