Prefer ini_config library support over iniparser support.

Abort if none of these libraries are found.

Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Simo Sorce <[email protected]>

Author: Günther Deschner

proxy/configure.ac

@@ -83,11 +83,11 @@ if test x$have_libverto = x; then
 fi
 
 #Check for iniparser
+have_iniparser=
 AC_CHECK_HEADERS([iniparser.h],
-    [AC_CHECK_LIB(iniparser, iniparser_set,
-        [ INI_LIBS="-liniparser"; AC_DEFINE([HAVE_INIPARSER], [1], [Iniparser library available.]) ],
+    [AC_CHECK_LIB(iniparser, iniparser_set, [ have_iniparser=1 ],
     [AC_MSG_ERROR([Iniparser library must support iniparser_set])])],
-    [AC_MSG_ERROR([Iniparser development package is not installed])]
+    [AC_MSG_WARN([Could not find Iniparser headers])]
 )
 
 #Check for libini_config
@@ -97,13 +97,22 @@ if test x$have_libini_config = x; then
 else
     INI_CONFIG_CFLAGS="`$PKG_CONFIG --cflags ini_config`"
     INI_CONFIG_LIBS="`$PKG_CONFIG --libs ini_config`"
-    AC_CHECK_LIB(ini_config, ini_config_file_open,
-                 [INI_LIBS="$INI_LIBS $INI_CONFIG_LIBS"; INI_CFLAGS="$INI_CONFIG_CFLAGS";
-                  AC_DEFINE([HAVE_DINGLIBS], [1], [Dinglibs library available.])],
+    AC_CHECK_LIB(ini_config, ini_config_file_open, [],
                  [AC_MSG_WARN([ini_config library must support ini_config_file_open])],
                  [$INI_CONFIG_LIBS])
 fi
 
+if test x$have_libini_config = x1; then
+    AC_DEFINE([WITH_DINGLIBS], [1], [Using ini_config])
+    INI_CFLAGS="$INI_CONFIG_CFLAGS"
+    INI_LIBS="$INI_CONFIG_LIBS"
+elif test x$have_iniparser = x1; then
+    AC_DEFINE([WITH_INIPARSER], [1], [Using iniparser])
+    INI_LIBS="-liniparser"
+else
+    AC_MSG_ERROR([Neither iniparser nor ini_config development packages available])
+fi
+
 AC_SUBST(INI_LIBS)
 AC_SUBST(INI_CFLAGS)
 

proxy/contrib/gssproxy.spec.in

@@ -37,7 +37,7 @@ BuildRequires: pkgconfig
 BuildRequires: krb5-devel
 BuildRequires: libselinux-devel
 BuildRequires: keyutils-libs-devel
-BuildRequires: iniparser-devel
+BuildRequires: libini_config-devel >= 1.0.0.1
 BuildRequires: libverto-devel
 BuildRequires: popt-devel
 BuildRequires: findutils

proxy/src/gp_config.c

@@ -355,10 +355,6 @@ void free_config(struct gp_config **cfg)
     *cfg = NULL;
 }
 
-#ifdef HAVE_INIPARSER
-#define WITH_INIPARSER 1
-#endif
-
 #ifdef WITH_INIPARSER
 #include "gp_config_iniparser.h"
 

proxy/src/gp_config_dinglibs.c

@@ -33,7 +33,7 @@
 #include "gp_config.h"
 #include "gp_config_dinglibs.h"
 
-#ifdef HAVE_DINGLIBS
+#ifdef WITH_DINGLIBS
 
 #include <ini_configobj.h>
 
@@ -202,4 +202,4 @@ char *gp_dinglibs_get_secname(struct gp_ini_context *ctx,
     return secname;
 }
 
-#endif /* HAVE_DINGLIBS */
+#endif /* WITH_DINGLIBS */

proxy/src/gp_config_iniparser.c

@@ -33,7 +33,7 @@
 #include "gp_config.h"
 #include "gp_config_iniparser.h"
 
-#ifdef HAVE_INIPARSER
+#ifdef WITH_INIPARSER
 
 #include <iniparser.h>
 
@@ -133,4 +133,4 @@ char *gp_iniparser_get_secname(struct gp_ini_context *ctx,
     return strdup(value);
 }
 
-#endif /* HAVE_INIPARSER */
+#endif /* WITH_INIPARSER */