add -I/usr/local/include to CFLAGS and -L/usr/local/lib to LDFLAGS by…

… default unless disabled by using --disable-extra-paths with configure

INSTALL_BSD

@@ -29,12 +29,6 @@ Compiling the binaries
  options for the cgi are in the beginning of the file. Additional examples
  for using the json output are also available in the same directory.
 
- Some BSD users may need to provide correct CFLAGS and LDFLAGS paths to the
- configure script if the image output is wanted but the location of libgd2
- isn't automatically detected. For example (using bash as shell):
-
-     CFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" ./configure
-
  For executing the optional test suite, see the appendix at the end of this
  file.
 

configure

@@ -742,6 +742,7 @@ enable_maintainer_mode
 enable_dependency_tracking
 enable_image_output
 enable_werror
+enable_extra_paths
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1389,6 +1390,8 @@ Optional Features:
 
   --enable-werror         add -Werror to CFLAGS
 
+  --disable-extra-paths   do not add extra paths to CFLAGS and LDFLAGS
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -4097,6 +4100,15 @@ fi
 
 
 
+# Check whether --enable-extra-paths was given.
+if test "${enable_extra_paths+set}" = set; then :
+  enableval=$enable_extra_paths;
+else
+
+CFLAGS="$CFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib"
+fi
+
+
 # Checks for libraries.
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5

configure.ac

@@ -22,6 +22,10 @@ AC_ARG_ENABLE([werror], [
 AS_HELP_STRING([--enable-werror], [add -Werror to CFLAGS])], [CFLAG_EXTRAS="-Werror"])
 AC_SUBST([CFLAG_EXTRAS])
 
+AC_ARG_ENABLE([extra-paths], [
+AS_HELP_STRING([--disable-extra-paths], [do not add extra paths to CFLAGS and LDFLAGS])], [], [
+CFLAGS="$CFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib"])
+
 # Checks for libraries.
 AC_CHECK_LIB([m], [pow], [], [AC_MSG_ERROR([could not find required math library])])
 AC_CHECK_LIB([sqlite3], [sqlite3_prepare_v2], [], [AC_MSG_ERROR([could not find required sqlite3 library])])