Shunichi Fuji : configure: Set default libs if ***-config is missing.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4bf77d6cf7e397400e128e8f2f907aaa83a0090b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4bf77d6cf7e397400e128e8f2f...

Author: Shunichi Fuji <palglowr(a)gmail.com>
Date:   Tue Jan 20 15:24:46 2009 +0900

configure: Set default libs if ***-config is missing.

---

 configure    |    3 +++
 configure.ac |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index cc46abe..ead0c3d 100755
--- a/configure
+++ b/configure
@@ -14116,6 +14116,7 @@ fi
         done
         CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl"
     fi
+    ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"}
     if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for gphoto2-camera.h" >&5
 $as_echo_n "checking for gphoto2-camera.h... " >&6; }
@@ -14551,6 +14552,7 @@ test -n "$ft_devel" || ft_devel="no"
         ac_freetype_incl=`$ft_devel --cflags`
         ac_freetype_libs=`$ft_devel --libs`
     fi
+    ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
     { $as_echo "$as_me:$LINENO: checking for -lfreetype" >&5
 $as_echo_n "checking for -lfreetype... " >&6; }
 if test "${ac_cv_lib_soname_freetype+set}" = set; then
@@ -15443,6 +15445,7 @@ fi
         ac_esd_libs=`$ESDCONFIG --libs`
         CFLAGS="$CFLAGS $ac_esd_incl"
     fi
+    ac_esd_libs=${ac_esd_libs:-"-lesd"}
     if test "${ac_cv_header_esd_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for esd.h" >&5
 $as_echo_n "checking for esd.h... " >&6; }
diff --git a/configure.ac b/configure.ac
index 72f93b7..8c7dfab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1013,6 +1013,7 @@ then
         done
         CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl"
     fi
+    ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"}
     AC_CHECK_HEADER(gphoto2-camera.h,
                     [AC_CHECK_LIB(gphoto2,gp_camera_new,
                                   [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment])
@@ -1060,6 +1061,7 @@ then
         ac_freetype_incl=`$ft_devel --cflags`
         ac_freetype_libs=`$ft_devel --libs`
     fi
+    ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
     WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs])
     if test "$ft_lib" = "yes"
     then
@@ -1141,6 +1143,7 @@ then
         ac_esd_libs=`$ESDCONFIG --libs`
         CFLAGS="$CFLAGS $ac_esd_incl"
     fi
+    ac_esd_libs=${ac_esd_libs:-"-lesd"}
     AC_CHECK_HEADER(esd.h,
         [AC_CHECK_LIB(esd,esd_open_sound,
             [AC_SUBST(ESDINCL, "$ac_esd_incl")