Ftabchi/dis.patch at master · hubgram/Ftabchi · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
--- tg/configure.ac	2015-10-24 14:23:51.964259062 +0200
+++ tg/configure.ac	2015-10-24 14:05:10.111062758 +0200
@@ -61,93 +61,43 @@
   ],[
   ])

+# liblua is required
 AC_MSG_CHECKING([for liblua])
-AC_ARG_ENABLE(liblua,[--enable-liblua/--disable-liblua],
-  [
-  if test "x$enableval" = "xno" ; then
-    AC_MSG_RESULT([disabled])
-  else
-    AC_MSG_RESULT([enabled])
-    AX_PROG_LUA([],[],
-      [
-        AX_LUA_HEADERS([],[AC_MSG_ERROR([No lua headers found. Try --disable-liblua])])
-        AX_LUA_LIBS([],[AC_MSG_ERROR([No lua libs found. Try --disable-liblua])])
-        [EXTRA_LIBS="${EXTRA_LIBS} ${LUA_LIB}" ; ]
-        [CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" ; ]
-        AC_DEFINE(USE_LUA,1,[use lua])
-      ],
-      [
-        AC_MSG_ERROR([No lua found. Try --disable-liblua])
-      ])
-  fi
-  ],[
-    AC_MSG_RESULT([enabled])
-    AX_PROG_LUA([],[],
-      [
-        AX_LUA_HEADERS([],[AC_MSG_ERROR([No lua headers found. Try --disable-liblua])])
-        AX_LUA_LIBS([],[AC_MSG_ERROR([No lua libs found. Try --disable-liblua])])
-        [EXTRA_LIBS="${EXTRA_LIBS} ${LUA_LIB}" ; ]
-        [CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" ; ]
-        AC_DEFINE(USE_LUA,1,[use lua])
-      ],
-      [
-        AC_MSG_ERROR([No lua found. Try --disable-liblua])
-      ])
-  ])
-
-AC_MSG_CHECKING([for python])
-AC_ARG_ENABLE(python,[--enable-python/--disable-python],
+AC_MSG_RESULT([enabled])
+AX_PROG_LUA([],[],
   [
-    if test "x$enableval" = "xno" ; then
-      AC_MSG_RESULT([disabled])
-    else
-      AC_MSG_RESULT([enabled])
-
-      AX_PYTHON()
-      AC_SUBST([PYTHON_FOUND])
-      if test $PYTHON_FOUND = no ; then
-        AC_MSG_ERROR([No supported python lib version found. Try --disable-python])
-      else
-        AC_SUBST([PYTHON_LIBS])
-        AC_SUBST([PYTHON_CFLAGS])
-        EXTRA_LIBS="${EXTRA_LIBS} -l${PYTHON_LIB}"
-        CPPFLAGS="${CPPFLAGS} -I${PYTHON_INCLUDE_DIR}"
-        AC_DEFINE(USE_PYTHON,1,[use python])
-      fi
-    fi
-  ],[
-      AC_MSG_RESULT([enabled])
-
-      AX_PYTHON()
-      AC_SUBST([PYTHON_FOUND])
-      if test $PYTHON_FOUND = no ; then
-        AC_MSG_ERROR([No supported python lib version found. Try --disable-python])
-      else
-        AC_SUBST([PYTHON_LIBS])
-        AC_SUBST([PYTHON_CFLAGS])
-        EXTRA_LIBS="${EXTRA_LIBS} -l${PYTHON_LIB}"
-        CPPFLAGS="${CPPFLAGS} -I${PYTHON_INCLUDE_DIR}"
-        AC_DEFINE(USE_PYTHON,1,[use python])
-      fi
+    AX_LUA_HEADERS([],[AC_MSG_ERROR([No lua headers found. Install them])])
+    AX_LUA_LIBS([],[AC_MSG_ERROR([No lua libs found. Install them])])
+    [EXTRA_LIBS="${EXTRA_LIBS} ${LUA_LIB}" ; ]
+    [CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" ; ]
+    AC_DEFINE(USE_LUA,1,[use lua])
+  ],
+  [
+    AC_MSG_ERROR([No lua found. Install lua])
   ])

+# Optional
+AC_MSG_CHECKING([for python])
+AX_PYTHON()
+AC_SUBST([PYTHON_FOUND])
+if test $PYTHON_FOUND = no ; then
+  AC_MSG_RESULT([disabled])
+else
+  AC_SUBST([PYTHON_LIBS])
+  AC_SUBST([PYTHON_CFLAGS])
+  EXTRA_LIBS="${EXTRA_LIBS} -l${PYTHON_LIB}"
+  CPPFLAGS="${CPPFLAGS} -I${PYTHON_INCLUDE_DIR}"
+  AC_DEFINE(USE_PYTHON,1,[use python])
+fi

-
+# Optional
 AC_MSG_CHECKING([for libjansson])
-AC_ARG_ENABLE(json,[--enable-json/--disable-json],
-  [
-  if test "x$enableval" = "xno" ; then
-    AC_MSG_RESULT([disabled])
-  else
-    AC_MSG_RESULT([enabled])
-    AC_CHECK_LIB([jansson],[json_array_set_new],[],AC_MSG_ERROR([No libjansson found. Try --disable-json]))
-    AC_DEFINE(USE_JSON,1,[use json])
-  fi
-  ],[
+AC_CHECK_LIB([jansson],[json_array_set_new],
+  [
     AC_MSG_RESULT([enabled])
-    AC_CHECK_LIB([jansson],[json_array_set_new],[],AC_MSG_ERROR([No libjansson found. Try --disable-json]))
     AC_DEFINE(USE_JSON,1,[use json])
-  ])
+  ],
+  [AC_MSG_RESULT([disabled])])

 #check for custom prog name
 AC_MSG_CHECKING([progname])
@@ -193,4 +143,3 @@
 AC_SUBST(EXTRA_LIBS)
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-