Changeset 1184:ae04f7a0b525

Timestamp:

03/17/09 07:00:40 (3 years ago)

Author:

niam

Branch:

default

Message:

detection of libbfd so in case it doesn't have link w/o version in the name

Location:

trunk

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (1 diff)

trunk/configure

@@ -6176 +6176 @@
                 MOD_BFD_DIR=/usr
         fi
+        BFD_SO=$(ldconfig -p | awk '{if (match($1, /^libbfd-.+\.so$/)!=0) {print substr($1, RSTART+3, RLENGTH-6)}}')
         CPPFLAGS="$CPPFLAGS -I$MOD_BFD_DIR/include"
-        LDFLAGS="$LDFLAGS -L$MOD_BFD_DIR/lib -lbfd"
-
-{ $as_echo "$as_me:$LINENO: checking for bfd_fopen in -lbfd" >&5
-$as_echo_n "checking for bfd_fopen in -lbfd... " >&6; }
-if test "${ac_cv_lib_bfd_bfd_fopen+set}" = set; then
+        LDFLAGS="$LDFLAGS -L$MOD_BFD_DIR/lib -l$BFD_SO"
+
+as_ac_Lib=`$as_echo "ac_cv_lib_$BFD_SO''_bfd_fopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for bfd_fopen in -l$BFD_SO" >&5
+$as_echo_n "checking for bfd_fopen in -l$BFD_SO... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbfd  $LIBS"
+LIBS="-l$BFD_SO  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6229 +6231 @@
          $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_bfd_bfd_fopen=yes
+  eval "$as_ac_Lib=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-        ac_cv_lib_bfd_bfd_fopen=no
+        eval "$as_ac_Lib=no"
 fi
 
@@ -6242 +6244 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_fopen" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_fopen" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_fopen" = x""yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+                 $as_echo "$as_val"'`
+               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+                 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBFD 1
-_ACEOF
-
-  LIBS="-lbfd $LIBS"
+#define `$as_echo "HAVE_LIB$BFD_SO" | $as_tr_cpp` 1
+_ACEOF
+
+  LIBS="-l$BFD_SO $LIBS"
 
 else

trunk/configure.in

@@ -282 +282 @@
                 MOD_BFD_DIR=/usr
         fi
+        BFD_SO=$(ldconfig -p | awk '{if (match($1, /^libbfd-.+\.so$/)!=0) {print substr($1, RSTART+3, RLENGTH-6)}}')
         CPPFLAGS="$CPPFLAGS -I$MOD_BFD_DIR/include"
-        LDFLAGS="$LDFLAGS -L$MOD_BFD_DIR/lib -lbfd"
-        AC_CHECK_LIB([bfd], [bfd_fopen], [], AC_MSG_ERROR(bfd lib was not found))
+        LDFLAGS="$LDFLAGS -L$MOD_BFD_DIR/lib -l$BFD_SO"
+        AC_CHECK_LIB([$BFD_SO], [bfd_fopen], [], AC_MSG_ERROR(bfd lib was not found))
         AC_CHECK_HEADER([bfd.h], [], AC_MSG_ERROR(bfd header was not found))
         echo -n -e "#define BFD_EXT 1\n\n" >> include/libdodo/directives.runtime.h