Moved freebsd cflags and ldflags to configure

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 482c5004d58075a8216eeeb2c8646cb630038d14..ff11dda083946de41edd62d1190d6ee64b5c5670 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -211,9 +211,6 @@ docker_ubuntu-16_04-amd64:
 
 # TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident.
 .freebsd-11-i386: &freebsd-11-i386_env
-  variables:
-    CPPFLAGS: "-I/usr/local/include"
-    LDFLAGS: "-L/usr/local/lib"
   tags:
   - freebsd
   - i386
@@ -223,9 +220,6 @@ docker_ubuntu-16_04-amd64:
   #- tags
 
 .freebsd-11-amd64: &freebsd-11-amd64_env
-  variables:
-    CPPFLAGS: "-I/usr/local/include"
-    LDFLAGS: "-L/usr/local/lib"
   tags:
   - freebsd
   - amd64

diff --git a/configure.ac b/configure.ac
index f73e62640f9304e7185f2c960c0c83d0b73a8242..f4de8f9301c7f0559064be39e8272ae68bccdcb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -181,6 +181,8 @@ else
       ;;
     freebsd*)
       sysdesc=bsd
+      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+      LDFLAGS="$LDFLAGS -L/usr/local/lib"
       ;;
     kfreebsd*)
       sysdesc=bsd