Add --with-ld10k1 configure option

Added --with-ld10k1 configure option for better detection of
ld10k1 package.
The include directory and ld10k1 symlink are automatically
created to point the local path.

diff --git a/qlo10k1/Makefile.am b/qlo10k1/Makefile.am
index 79b89c34265a704333227d8ed934d9d68c4c297c..9e35092bb3c861c9914f7e2f631febeace8af44e 100644 (file)
--- a/qlo10k1/Makefile.am
+++ b/qlo10k1/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src include
+SUBDIRS = src
 
 EXTRA_DIST = COPYING configure.in README NEWS AUTHORS TODO INSTALL ChangeLog
 

diff --git a/qlo10k1/config.h.in b/qlo10k1/config.h.in
index 9c8fbb19fcf9c11a76a7f90e1165e4c966095a16..215c9bda489f234cf5030f3d86a59893850ecbee 100644 (file)
--- a/qlo10k1/config.h.in
+++ b/qlo10k1/config.h.in
@@ -6,6 +6,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `lo10k1' library (-llo10k1). */
+#undef HAVE_LIBLO10K1
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

diff --git a/qlo10k1/configure.in b/qlo10k1/configure.in
index 579a94f04347d836b10176572842cff2f9ebd2d2..afe8209d130414c068696f7b34080cd5af5b5a08 100644 (file)
--- a/qlo10k1/configure.in
+++ b/qlo10k1/configure.in
@@ -9,15 +9,29 @@ AC_PROG_LIBTOOL
 AC_C_BIGENDIAN
 gw_CHECK_QT
 
-dnl AM_PATH_LD10K1(0.1.8)
+dnl Check ld10k1 availability
+AC_ARG_WITH(ld10k1,
+  [  --with-ld10k1  local|system  Specify the ld10k1 installation (default=local)],
+  ld10k1="$withval",
+  ld10k1="local")
 
-dnl Build with the local ld10k1
-rm -f include/lo10k1
-ln -s ../../ld10k1/include include/lo10k1
-LD10K1_CFLAGS="-I../include"
-LD10K1_LIBS="-L../../ld10k1/src -llo10k1"
-AC_SUBST(LD10K1_CFLAGS)
-AC_SUBST(LD10K1_LIBS)
+if test "$ld10k1" = "system"; then
+  AM_PATH_LD10K1(0.1.8)
+else
+  if test "$ld10k1" = "local"; then
+    ld10k1="../ld10k1"
+  fi
+  test -d "$ld10k1" || AC_MSG_ERROR([Cannot find ld10k1 directory $ld10k1])
+  rm -f ld10k1
+  ln -s $ld10k1 ld10k1
+  rm -rf include
+  mkdir include
+  ln -s ../ld10k1/include include/lo10k1
+  LD10K1_CFLAGS="-I../include"
+  LD10K1_LIBS="-L$ld10k1/src -llo10k1"
+  AC_SUBST(LD10K1_CFLAGS)
+  AC_SUBST(LD10K1_LIBS)
+fi
 
 AC_OUTPUT(Makefile
-       src/Makefile include/Makefile)
\ No newline at end of file
+       src/Makefile)

diff --git a/qlo10k1/include/Makefile.am b/qlo10k1/include/Makefile.am
deleted file mode 100644 (file)
index e69de29..0000000