You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
130 lines
4.4 KiB
130 lines
4.4 KiB
16 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../libgphoto/libtool-fix.patch
|
||
|
|
# Copyright (C) 2008 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
diff -Nur libgphoto2-2.4.1-orig/configure libgphoto2-2.4.1/configure
|
||
|
|
--- libgphoto2-2.4.1-orig/configure 2008-04-20 11:47:59.000000000 +0000
|
||
|
|
+++ libgphoto2-2.4.1/configure 2008-04-20 11:48:16.000000000 +0000
|
||
|
|
@@ -20504,9 +20504,9 @@
|
||
|
|
|
||
|
|
fi
|
||
|
|
if test $ac_cv_header_ltdl_h = yes; then
|
||
|
|
- { echo "$as_me:$LINENO: checking for lt_dlcaller_register in -lltdl" >&5
|
||
|
|
-echo $ECHO_N "checking for lt_dlcaller_register in -lltdl... $ECHO_C" >&6; }
|
||
|
|
-if test "${ac_cv_lib_ltdl_lt_dlcaller_register+set}" = set; then
|
||
|
|
+ { echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5
|
||
|
|
+echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6; }
|
||
|
|
+if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then
|
||
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
|
|
else
|
||
|
|
ac_check_lib_save_LIBS=$LIBS
|
||
|
|
@@ -20524,11 +20524,11 @@
|
||
|
|
#ifdef __cplusplus
|
||
|
|
extern "C"
|
||
|
|
#endif
|
||
|
|
-char lt_dlcaller_register ();
|
||
|
|
+char lt_dlinit ();
|
||
|
|
int
|
||
|
|
main ()
|
||
|
|
{
|
||
|
|
-return lt_dlcaller_register ();
|
||
|
|
+return lt_dlinit ();
|
||
|
|
;
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
@@ -20551,21 +20551,21 @@
|
||
|
|
test ! -s conftest.err
|
||
|
|
} && test -s conftest$ac_exeext &&
|
||
|
|
$as_test_x conftest$ac_exeext; then
|
||
|
|
- ac_cv_lib_ltdl_lt_dlcaller_register=yes
|
||
|
|
+ ac_cv_lib_ltdl_lt_dlinit=yes
|
||
|
|
else
|
||
|
|
echo "$as_me: failed program was:" >&5
|
||
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
|
|
||
|
|
- ac_cv_lib_ltdl_lt_dlcaller_register=no
|
||
|
|
+ ac_cv_lib_ltdl_lt_dlinit=no
|
||
|
|
fi
|
||
|
|
|
||
|
|
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
|
|
conftest$ac_exeext conftest.$ac_ext
|
||
|
|
LIBS=$ac_check_lib_save_LIBS
|
||
|
|
fi
|
||
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlcaller_register" >&5
|
||
|
|
-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlcaller_register" >&6; }
|
||
|
|
-if test $ac_cv_lib_ltdl_lt_dlcaller_register = yes; then
|
||
|
|
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
|
||
|
|
+echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; }
|
||
|
|
+if test $ac_cv_lib_ltdl_lt_dlinit = yes; then
|
||
|
|
LTDLINCL=""
|
||
|
|
LIBLTDL="-lltdl"
|
||
|
|
|
||
|
|
diff -Nur libgphoto2-2.4.1-orig/libgphoto2_port/configure libgphoto2-2.4.1/libgphoto2_port/configure
|
||
|
|
--- libgphoto2-2.4.1-orig/libgphoto2_port/configure 2008-04-20 11:47:59.000000000 +0000
|
||
|
|
+++ libgphoto2-2.4.1/libgphoto2_port/configure 2008-04-20 11:48:27.000000000 +0000
|
||
|
|
@@ -20074,9 +20074,9 @@
|
||
|
|
|
||
|
|
fi
|
||
|
|
if test $ac_cv_header_ltdl_h = yes; then
|
||
|
|
- { echo "$as_me:$LINENO: checking for lt_dlcaller_register in -lltdl" >&5
|
||
|
|
-echo $ECHO_N "checking for lt_dlcaller_register in -lltdl... $ECHO_C" >&6; }
|
||
|
|
-if test "${ac_cv_lib_ltdl_lt_dlcaller_register+set}" = set; then
|
||
|
|
+ { echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5
|
||
|
|
+echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6; }
|
||
|
|
+if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then
|
||
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
|
|
else
|
||
|
|
ac_check_lib_save_LIBS=$LIBS
|
||
|
|
@@ -20094,11 +20094,11 @@
|
||
|
|
#ifdef __cplusplus
|
||
|
|
extern "C"
|
||
|
|
#endif
|
||
|
|
-char lt_dlcaller_register ();
|
||
|
|
+char lt_dlinit ();
|
||
|
|
int
|
||
|
|
main ()
|
||
|
|
{
|
||
|
|
-return lt_dlcaller_register ();
|
||
|
|
+return lt_dlinit ();
|
||
|
|
;
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
@@ -20121,21 +20121,21 @@
|
||
|
|
test ! -s conftest.err
|
||
|
|
} && test -s conftest$ac_exeext &&
|
||
|
|
$as_test_x conftest$ac_exeext; then
|
||
|
|
- ac_cv_lib_ltdl_lt_dlcaller_register=yes
|
||
|
|
+ ac_cv_lib_ltdl_lt_dlinit=yes
|
||
|
|
else
|
||
|
|
echo "$as_me: failed program was:" >&5
|
||
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
|
|
||
|
|
- ac_cv_lib_ltdl_lt_dlcaller_register=no
|
||
|
|
+ ac_cv_lib_ltdl_lt_dlinit=no
|
||
|
|
fi
|
||
|
|
|
||
|
|
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
|
|
conftest$ac_exeext conftest.$ac_ext
|
||
|
|
LIBS=$ac_check_lib_save_LIBS
|
||
|
|
fi
|
||
|
|
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlcaller_register" >&5
|
||
|
|
-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlcaller_register" >&6; }
|
||
|
|
-if test $ac_cv_lib_ltdl_lt_dlcaller_register = yes; then
|
||
|
|
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
|
||
|
|
+echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; }
|
||
|
|
+if test $ac_cv_lib_ltdl_lt_dlinit = yes; then
|
||
|
|
LTDLINCL=""
|
||
|
|
LIBLTDL="-lltdl"
|