Browse Source

Remove libbfd and libintl configure checking

git-svn-id: https://klish.googlecode.com/svn/trunk@595 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb
Serj Kalichev 12 years ago
parent
commit
601e395971
5 changed files with 2 additions and 175 deletions
  1. 1 3
      Makefile.in
  2. 1 2
      bin/module.am
  3. 0 9
      config.h.in
  4. 0 126
      configure
  5. 0 35
      configure.ac

+ 1 - 3
Makefile.in

@@ -285,7 +285,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BFD_LIBS = @BFD_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -445,8 +444,7 @@ bin_clish_LDADD = \
 	libkonf.la \
 	libtinyrl.la \
 	libtinyxml.la \
-	liblub.la \
-	@BFD_LIBS@
+	liblub.la
 
 bin_konfd_SOURCES = bin/konfd.c
 bin_konfd_LDADD = \

+ 1 - 2
bin/module.am

@@ -10,8 +10,7 @@ bin_clish_LDADD = \
 	libkonf.la \
 	libtinyrl.la \
 	libtinyxml.la \
-	liblub.la \
-	@BFD_LIBS@
+	liblub.la
 
 bin_konfd_SOURCES = bin/konfd.c
 bin_konfd_LDADD = \

+ 0 - 9
config.h.in

@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the <bfd.h> header file. */
-#undef HAVE_BFD_H
-
 /* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
@@ -21,12 +18,6 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
-/* Have Binary File Decription library */
-#undef HAVE_LIBBFD
-
-/* Have native langauage support library */
-#undef HAVE_LIBINTL
-
 /* Have POSIX real time library */
 #undef HAVE_LIBRT
 

+ 0 - 126
configure

@@ -615,7 +615,6 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-BFD_LIBS
 RT_CFLAGS
 RT_LIBS
 TINYXML_CXXFLAGS
@@ -757,7 +756,6 @@ enable_libtool_lock
 enable_dependency_tracking
 enable_debug
 with_rt
-enable_gpl
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1400,7 +1398,6 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-debug          Turn on debugging including asserts [default=no]
-  --enable-gpl            Link with GPL licenced libraries [default=yes]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -16512,129 +16509,6 @@ $as_echo "#define HAVE_LIBRT /**/" >>confdefs.h
 fi
 
 
-################################
-# Check for linkage with GPL libraries
-################################
-# Check whether --enable-gpl was given.
-if test "${enable_gpl+set}" = set; then :
-  enableval=$enable_gpl;
-else
-  enable_gpl=yes
-fi
-
-
-if test "x$enable_gpl" = "xyes"; then
-    ################################
-    # Check for BFD library
-    ################################
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Linking with GPL licence libraries" >&5
-$as_echo "$as_me: WARNING: Linking with GPL licence libraries" >&2;}
-    for ac_header in bfd.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
-if test "x$ac_cv_header_bfd_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BFD_H 1
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_init in -lbfd" >&5
-$as_echo_n "checking for bfd_init in -lbfd... " >&6; }
-if ${ac_cv_lib_bfd_bfd_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbfd  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bfd_init ();
-int
-main ()
-{
-return bfd_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_bfd_bfd_init=yes
-else
-  ac_cv_lib_bfd_bfd_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_init" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_init" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_init" = xyes; then :
-
-$as_echo "#define HAVE_LIBBFD /**/" >>confdefs.h
-
-                       BFD_LIBS="-lbfd -liberty"
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libintl_dgettext in -lintl" >&5
-$as_echo_n "checking for libintl_dgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_libintl_dgettext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char libintl_dgettext ();
-int
-main ()
-{
-return libintl_dgettext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_libintl_dgettext=yes
-else
-  ac_cv_lib_intl_libintl_dgettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_libintl_dgettext" >&5
-$as_echo "$ac_cv_lib_intl_libintl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_libintl_dgettext" = xyes; then :
-
-$as_echo "#define HAVE_LIBINTL /**/" >>confdefs.h
-
-                                     BFD_LIBS="$BFD_LIBS -lintl"
-
-fi
-
-
-
-fi
-
-
-fi
-
-done
-
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping BFD library checks because of GPL Licence" >&5
-$as_echo "$as_me: WARNING: Skipping BFD library checks because of GPL Licence" >&2;}
-fi
-
 ################################
 # Search for network functions (like connect())
 ################################

+ 0 - 35
configure.ac

@@ -135,41 +135,6 @@ AC_CHECK_LIB(rt,
                 AC_SUBST(RT_CFLAGS)
              ])
 
-################################
-# Check for linkage with GPL libraries
-################################
-AC_ARG_ENABLE(gpl,
-    [AS_HELP_STRING([--enable-gpl],
-                    [Link with GPL licenced libraries [default=yes]])],
-    [],
-    [enable_gpl=yes])
-
-if test "x$enable_gpl" = "xyes"; then
-    ################################
-    # Check for BFD library
-    ################################
-    AC_MSG_WARN([Linking with GPL licence libraries])
-    AC_CHECK_HEADERS(bfd.h,
-        [AC_CHECK_LIB(bfd, 
-                      bfd_init,
-                      [AC_DEFINE([HAVE_LIBBFD], 
-                                 [], 
-                                 [Have Binary File Decription library])
-                       BFD_LIBS="-lbfd -liberty"
-                       AC_CHECK_LIB(intl, 
-                                    libintl_dgettext, 
-                                    [AC_DEFINE([HAVE_LIBINTL], 
-                                               [], 
-                                               [Have native langauage support library])
-                                     BFD_LIBS="$BFD_LIBS -lintl"
-                                    ])
-                       AC_SUBST(BFD_LIBS)
-                      ])
-        ])
-else
-    AC_MSG_WARN([Skipping BFD library checks because of GPL Licence])
-fi
-
 ################################
 # Search for network functions (like connect())
 ################################