Search for lzo/lzo1x.h, lzo2/lzo1x.h and lzo1x.h.

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 2697d6f0a4bd5923b41c4513e3bcba6efb7a7381..a996b1d09bccac82542af92751c27fc5b26273f0 100644 (file)
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -22,16 +22,21 @@ AC_DEFUN([tinc_LZO],
   )
 
   AC_CHECK_LIB(lzo2, lzo1x_1_compress,
   )
 
   AC_CHECK_LIB(lzo2, lzo1x_1_compress,

-    [AC_CHECK_HEADERS(lzo/lzo1x.h,
-      [LIBS="$LIBS -llzo2"],
-      [AC_MSG_ERROR("lzo2 header files not found."); break]
-    )],
+    [LIBS="$LIBS -llzo2"],

     [AC_CHECK_LIB(lzo, lzo1x_1_compress,
     [AC_CHECK_LIB(lzo, lzo1x_1_compress,

-      [AC_CHECK_HEADERS(lzo1x.h,
-        [LIBS="$LIBS -llzo"],
-       [AC_MSG_ERROR("lzo1 header files not found."); break]
-      )],
+      [LIBS="$LIBS -llzo"],

       [AC_MSG_ERROR("lzo libraries not found."); break]
     )]
   )
       [AC_MSG_ERROR("lzo libraries not found."); break]
     )]
   )

+
+  AC_CHECK_HEADERS(lzo/lzo1x.h,
+    [AC_DEFINE(LZO1X_H, [<lzo/lzo1x.h>], [Location of lzo1x.h])],
+    [AC_CHECK_HEADERS(lzo2/lzo1x.h,
+      [AC_DEFINE(LZO1X_H, [<lzo2/lzo1x.h>], [Location of lzo1x.h])],
+      [AC_CHECK_HEADERS(lzo1x.h,
+        [AC_DEFINE(LZO1X_H, [<lzo1x.h>], [Location of lzo1x.h])],
+        [AC_MSG_ERROR("lzo header files not found."); break]
+      )]
+    )]
+  )

 ])
 ])

diff --git a/src/net_packet.c b/src/net_packet.c
index 20bee349e0923b200076ac865f9d818894f7a326..105cafbb21e3d2b90368fa739de5a1aafff95d8e 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -29,12 +29,7 @@
 #include <openssl/hmac.h>
 
 #include <zlib.h>
 #include <openssl/hmac.h>
 
 #include <zlib.h>

-#ifdef HAVE_LZO_LZO1X_H
-#include <lzo/lzo1x.h>
-#endif
-#ifdef HAVE_LZO1X_H
-#include <lzo1x.h>
-#endif
+#include LZO1X_H

 
 #include "avl_tree.h"
 #include "conf.h"
 
 #include "avl_tree.h"
 #include "conf.h"

diff --git a/src/tincd.c b/src/tincd.c
index 7619af552cbc8ef1369f5f79b2be6d004284a5a4..b6a24da9a6dfb88c262537343a9c09012f46a939 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -37,12 +37,7 @@
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 

-#ifdef HAVE_LZO_LZO1X_H
-#include <lzo/lzo1x.h>
-#endif
-#ifdef HAVE_LZO1X_H
-#include <lzo1x.h>
-#endif
+#include LZO1X_H

 
 #include <getopt.h>
 #include "pidfile.h"
 
 #include <getopt.h>
 #include "pidfile.h"